rpms/gstreamer/OLPC-3 gstreamer-0.10.9-docs.patch, 1.2, 1.3 import.log, NONE, 1.1 .cvsignore, 1.33, 1.34 gstreamer.spec, 1.78, 1.79 sources, 1.34, 1.35 gstreamer-inspect-rpm-format.patch, 1.1, NONE gstreamer.prov, 1.1, NONE

[Daniel Drake]

Author: dsd

Update of /cvs/pkgs/rpms/gstreamer/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24233/OLPC-3

Modified Files:
	.cvsignore gstreamer.spec sources 
Added Files:
	gstreamer-0.10.9-docs.patch import.log 
Removed Files:
	gstreamer-inspect-rpm-format.patch gstreamer.prov 
Log Message:
revert to OLPC-2 version


gstreamer-0.10.9-docs.patch:

Index: gstreamer-0.10.9-docs.patch
===================================================================
RCS file: gstreamer-0.10.9-docs.patch
diff -N gstreamer-0.10.9-docs.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gstreamer-0.10.9-docs.patch	25 Aug 2008 14:56:44 -0000	1.3
@@ -0,0 +1,18 @@
+--- gstreamer-0.10.9/docs/Makefile.in.docs	2006-07-27 21:18:06.000000000 -0400
++++ gstreamer-0.10.9/docs/Makefile.in	2006-07-27 21:18:43.000000000 -0400
+@@ -376,12 +376,9 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+- at ENABLE_GTK_DOC_FALSE@SUBDIRS_GTK_DOC = 
+- at ENABLE_GTK_DOC_TRUE@SUBDIRS_GTK_DOC = gst libs
+- at ENABLE_PLUGIN_DOCS_FALSE@SUBDIRS_PLUGIN_DOCS = 
+- at ENABLE_PLUGIN_DOCS_TRUE@SUBDIRS_PLUGIN_DOCS = plugins
+- at ENABLE_DOCBOOK_FALSE@SUBDIRS_DOCBOOK = 
+- at ENABLE_DOCBOOK_TRUE@SUBDIRS_DOCBOOK = faq manual pwg
++SUBDIRS_GTK_DOC = gst libs
++SUBDIRS_PLUGIN_DOCS = plugins
++SUBDIRS_DOCBOOK = faq manual pwg
+ BUILT_SOURCES = version.entities
+ SUBDIRS = design $(SUBDIRS_DOCBOOK) $(SUBDIRS_GTK_DOC) $(SUBDIRS_PLUGIN_DOCS)
+ DIST_SUBDIRS = design gst libs plugins faq manual pwg slides xsl


--- NEW FILE import.log ---
gstreamer-0_10_12-1_olpc2:OLPC-3:gstreamer-0.10.12-1.olpc2.src.rpm:1219676018


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/OLPC-3/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	4 Apr 2008 10:38:16 -0000	1.33
+++ .cvsignore	25 Aug 2008 14:56:44 -0000	1.34
@@ -1 +1 @@
-gstreamer-0.10.19.tar.bz2
+gstreamer-0.10.12.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/OLPC-3/gstreamer.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gstreamer.spec	4 Apr 2008 10:38:16 -0000	1.78
+++ gstreamer.spec	25 Aug 2008 14:56:44 -0000	1.79
@@ -5,7 +5,7 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.19
+Version: 	0.10.12
 Release: 	1%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
@@ -13,11 +13,10 @@
 License: 	LGPL
 URL:		http://gstreamer.freedesktop.org/
 Source: 	http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.bz2
+Patch0:		gstreamer-0.10.9-docs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	gstreamer-tools >= %{version}
-# gst-feedback uses these
-Requires:	which, pkgconfig
 
 BuildRequires: 	glib2-devel >= %{_glib2}
 BuildRequires: 	libxml2-devel >= %{_libxml2}
@@ -31,10 +30,6 @@
 # because AM_PROG_LIBTOOL was used in configure.ac
 BuildRequires:	gcc-c++
 
-# For the GStreamer RPM provides
-Patch1:		gstreamer-inspect-rpm-format.patch
-Source1:	gstreamer.prov
-
 ### documentation requirements
 ### not needed currrently
 # BuildRequires:  python2
@@ -66,7 +61,6 @@
 Requires: 	%{name} = %{version}-%{release}
 Requires: 	glib2-devel >= %{_glib2}
 Requires: 	libxml2-devel >= %{_libxml2}
-Requires:	check-devel
 
 %description devel
 GStreamer is a streaming media framework, based on graphs of filters which
@@ -97,10 +91,7 @@
 
 %prep
 %setup -q -n gstreamer-%{version}
-
-pushd tools/
-%patch1 -p0 -b .rpm-provides
-popd
+%patch0 -p1 -b .docs
 
 %build
 # 0.10.0: manuals do not build due to an openjade error; disable for now
@@ -113,7 +104,7 @@
 
 #make %{?_smp_mflags}
 # FIXME: docs building doesn't work with smp yet
-make ERROR_CFLAGS=""
+make
 
 %install  
 rm -rf $RPM_BUILD_ROOT
@@ -130,8 +121,6 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # Create empty cache directory
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majorminor}
-# Add the provides script
-install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/gstreamer.prov
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -207,47 +196,7 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor}/*
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
-%{_libdir}/rpm/gstreamer.prov
-
 %changelog
-* Fri Apr 04 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.19-1
-- Update to 0.10.19
-
-* Wed Mar 19 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.18-1
-- Update to 0.10.18
-- Add patch to gst-inspect to generate RPM provides
-- Add RPM find-provides script
-
-* Tue Mar 04 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.17.2-1
-- Update to 0.10.17.2 pre-release
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.10.17-2
-- Autorebuild for GCC 4.3
-
-* Wed Jan 30 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.17-1
-- Update to 0.10.17
-
-* Tue Jan 29 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.16-1
-- Update to 0.10.16
-
-* Fri Nov 16 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-1
-- Update to 0.10.15
-
-* Mon Oct  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.10.14-4
-- Add missing Requires (#312671)
-
-* Tue Aug 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.10.14-3
-- Require check-devel (#251956)
-
-* Sat Aug 04 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.14-1
-- Update to 0.10.14
-
-* Tue Jun 05 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.13-2
-- Remove upstreamed docs patch
-
-* Tue Jun 05 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.13-1
-- Update to 0.10.13
-
 * Thu Mar 08 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.12-1
 - Update to 0.10.12
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/OLPC-3/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	4 Apr 2008 10:38:16 -0000	1.34
+++ sources	25 Aug 2008 14:56:44 -0000	1.35
@@ -1 +1 @@
-12072a3168420350ea450749a3b63be8  gstreamer-0.10.19.tar.bz2
+d3ad1b5f265ab1bd695405fea26317a4  gstreamer-0.10.12.tar.bz2


--- gstreamer-inspect-rpm-format.patch DELETED ---


--- gstreamer.prov DELETED ---