SPECS (AC-branch): gstreamer.spec - merged from HEAD

baggins baggins at pld-linux.org
Mon May 15 19:26:58 CEST 2006 

Author: baggins                      Date: Mon May 15 17:26:57 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gstreamer.spec (1.72 -> 1.72.2.1) 

---- Diffs:

================================================================
Index: SPECS/gstreamer.spec
diff -u SPECS/gstreamer.spec:1.72 SPECS/gstreamer.spec:1.72.2.1
--- SPECS/gstreamer.spec:1.72	Mon Sep  5 13:57:44 2005
+++ SPECS/gstreamer.spec	Mon May 15 19:26:52 2006
@@ -1,36 +1,43 @@
 # $Revision$, $Date$
+
+%define		_vmajor		0.10
+%define		_vminor		5
+
 Summary:	GStreamer Streaming-media framework runtime
 Summary(pl):	GStreamer - biblioteki środowiska do obróbki strumieni
 Name:		gstreamer
-Version:	0.8.11
+Version:	%{_vmajor}.%{_vminor}
 Release:	1
 License:	LGPL
 Group:		Libraries
 Source0:	http://gstreamer.freedesktop.org/src/gstreamer/%{name}-%{version}.tar.bz2
-# Source0-md5:	3a251cf05b794ebac04e18f71e5b26eb
+# Source0-md5:	f088c1303f19f0423f35d699deed92e3
 Patch0:		%{name}-without_ps_pdf.patch
+Patch1:		%{name}-eps.patch
 URL:		http://gstreamer.net/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1.6
 BuildRequires:	bison >= 1.35
+BuildRequires:	check >= 0.9.3-2
+BuildRequires:	docbook-utils >= 0.6.10
 BuildRequires:	flex
-BuildRequires:	glib2-devel >= 1:2.6.0
-BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	glib2-devel >= 1:2.8.0
+BuildRequires:	gtk-doc >= 1.3
 BuildRequires:	libtool >= 1.4
 BuildRequires:	libxml2-devel >= 2.4.17
 BuildRequires:	nasm
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	popt-devel >= 1.6.3
+# not sure it is a right place for this BR
+BuildRequires:	python-PyXML
 BuildRequires:	transfig
 BuildRequires:	xmlto
-Requires:	glib2 >= 1:2.6.0
-Requires(post):	/sbin/ldconfig
+Requires:	glib2 >= 1:2.8.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_gstlibdir	%{_libdir}/gstreamer-0.8
-%define		_gstincludedir	%{_includedir}/gstreamer-0.8
-%define		_gstcachedir	%{_var}/cache/gstreamer
+%define		_gstlibdir	%{_libdir}/gstreamer-%{_vmajor}
+%define		_gstincludedir	%{_includedir}/gstreamer-%{_vmajor}
 
 %description
 GStreamer is a streaming-media framework, based on graphs of filters
@@ -53,7 +60,7 @@
 Summary(pl):	Pliki nagłówkowe do środowiska obróbki strumieni GStreamer
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.4.4
+Requires:	glib2-devel >= 1:2.8.0
 Requires:	libxml2-devel >= 2.4.17
 Requires:	popt-devel >= 1.6.3
 
@@ -77,9 +84,22 @@
 %description static -l pl
 Statyczne wersje bibliotek GStreamer.
 
+%package apidocs
+Summary:	GStreamer API documentation
+Summary(pl):	Dokumentacja API Gstreamera
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+GStreamer API documentation.
+
+%description apidocs -l pl
+Dokumentacja API Gstreamera.
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -89,33 +109,23 @@
 %{__automake}
 
 %configure \
-	--program-suffix="" \
-%ifarch i586 i686 athlon
-	--enable-fast-stack-trash \
-%else
-	--disable-fast-stack-trash \
-%endif
-	--enable-libmmx \
-	--enable-atomic \
 	--disable-examples \
+	--disable-pspdf \
 	--disable-tests \
-	--disable-debug \
-	--disable-debug-color \
-	--enable-docs-build \
-	--with-html-dir=%{_gtkdocdir} \
-	--with-cachedir=%{_gstcachedir}
-	
+	--enable-docbook \
+	--enable-gtk-doc \
+	--with-html-dir=%{_gtkdocdir}
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_gstcachedir},%{_docdir}/%{name}-devel-%{version}}
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-touch $RPM_BUILD_ROOT%{_gstcachedir}/registry.xml
-
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-{%{_vmajor},%{version}}
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{manual,pwg} \
 	$RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
 
@@ -127,11 +137,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-umask 022
-%{_bindir}/gst-register --gst-registry=%{_gstcachedir}/registry.xml > /dev/null 2> /dev/null ||:
-
+%post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -141,17 +147,14 @@
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 %dir %{_gstlibdir}
 %attr(755,root,root) %{_gstlibdir}/*.so
-%dir %{_gstcachedir}
-%ghost %{_gstcachedir}/registry.xml
 %{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
-%doc DEVEL
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
+%{_docdir}/%{name}-devel-%{version}
 %{_gstincludedir}
-%{_gtkdocdir}/*
 %{_pkgconfigdir}/*
 %{_aclocaldir}/*
 
@@ -159,12 +162,63 @@
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72.2.1  2006/05/15 17:26:52  baggins
+- merged from HEAD
+
+Revision 1.86  2006/04/28 12:52:43  wrobell
+- ver. 0.10.5
+
+Revision 1.85  2006/03/12 20:28:05  sparky
+- check with -fPIC required
+
+Revision 1.84  2006/03/12 10:04:38  freetz
+- 0.10.4
+
+Revision 1.83  2006/02/28 23:37:25  glen
+- adapterized (killed trailing spaces/tabs)
+
+Revision 1.82  2006/02/22 17:22:13  freetz
+- rel.2
+
+Revision 1.81  2006/02/20 20:49:53  freetz
+- BR check
+
+Revision 1.80  2006/02/20 18:35:52  freetz
+- trying to really disable ps/pdf creation
+
+Revision 1.79  2006/02/20 18:14:53  freetz
+- fixed dir pre-installation
+
+Revision 1.78  2006/02/20 17:32:12  freetz
+- killed cachedir, rel.1
+
+Revision 1.77  2006/02/11 16:55:30  qboosh
+- updated to 0.10.3
+
+Revision 1.76  2006/01/18 15:02:11  freetz
+- 0.10.2, apidocs subpkg, more BR
+
+Revision 1.75  2006/01/14 14:22:14  qboosh
+- updated gtk-doc BR
+- force glib 2.8.0 because of code differences
+
+Revision 1.74  2006/01/14 13:26:52  qboosh
+- updated without_ps_pdf patch (now configurable - but not disabled by default (yet?)
+- added eps patch - fixes docbook2ps failure on manual
+
+Revision 1.73  2005/12/31 12:31:49  aflinta
+- first try to stable 0.10.1
+
 Revision 1.72  2005/09/05 11:57:44  freetz
 - 0.8.11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gstreamer.spec?r1=1.72&r2=1.72.2.1&f=u

More information about the pld-cvs-commit mailing list