From 95733f48776a0f00cab5ed12ea6127bd87232c1c Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 13 Oct 2003 11:13:35 +0000 Subject: [PATCH] syncing with upstream package fixes Original commit message from CVS: syncing with upstream package fixes --- gstreamer.spec.in | 110 +++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 56 deletions(-) diff --git a/gstreamer.spec.in b/gstreamer.spec.in index ba1d9f769b..340dfa6995 100644 --- a/gstreamer.spec.in +++ b/gstreamer.spec.in @@ -3,12 +3,12 @@ Version: @VERSION@ Release: @GST_VERSION_RELEASE@ Summary: GStreamer streaming media framework runtime. -Group: Libraries/Multimedia +Group: System Environment/Libraries License: LGPL URL: http://gstreamer.net/ Vendor: GStreamer Backpackers Team Source: http://gstreamer.net/releases/%{version}/src/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define majorminor @GST_MAJORMINOR@ %define _glib2 @GLIB2_REQ@ @@ -31,10 +31,15 @@ BuildRequires: popt > 1.6 Prereq: /sbin/ldconfig ### documentation requirements -BuildRequires: openjade BuildRequires: python2 BuildRequires: docbook-style-dsssl docbook-dtd31-sgml BuildRequires: transfig xfig +BuildRequires: ghostscript +BuildRequires: xmlto +# we want xmltex.fmt generated +BuildRequires: jadetex +BuildRequires: tetex-dvips +BuildRequires: netpbm-progs %description GStreamer is a streaming-media framework, based on graphs of filters which @@ -65,7 +70,7 @@ applications and plugins for GStreamer. %package tools Summary: tools for GStreamer streaming media framework. -Group: Libraries/Multimedia +Group: Applications/Multimedia Requires: %{name} %description tools @@ -84,59 +89,45 @@ in the future. %setup %build -CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ -CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ -FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \ -%{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} ; \ -./configure \ - --prefix=%{_prefix} \ - --exec-prefix=%{_exec_prefix} \ - --bindir=%{_bindir} \ - --sbindir=%{_sbindir} \ - --sysconfdir=%{_sysconfdir} \ - --datadir=%{_datadir} \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - --libexecdir=%{_libexecdir} \ - --localstatedir=%{_localstatedir} \ - --sharedstatedir=%{_sharedstatedir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ +%configure \ --enable-debug \ --with-cachedir=%{_localstatedir}/cache/gstreamer-%{majorminor} \ --disable-tests --disable-examples \ --enable-docs-build --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html -if [ "$SMP" != "" ]; then - (make "MAKE=make -k -j $SMP"; exit 0) -else - make -fi +make %{?_smp_mflags} %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %makeinstall # Clean out files that should not be part of the rpm. -# This is the recommended way of dealing with it for RH8 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majorminor} rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{majorminor}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{majorminor}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +# Copy built docbook docs to gstreamer-devel docs dir +for a in faq manual pwg; do + mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/$a + cp -p docs/$a/$a.ps $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/$a + cp -p docs/$a/$a.pdf $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/$a + cp -pr docs/$a/html $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/$a +done + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -%{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null +env DISPLAY= %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null %postun /sbin/ldconfig %files -%defattr(-, root, root, -) +%defattr(-,root,root,-) %doc AUTHORS COPYING README TODO COPYING.LIB ABOUT-NLS REQUIREMENTS DOCBUILDING RELEASE %{_libdir}/libgstreamer-%{majorminor}.so.* %{_libdir}/libgstcontrol-%{majorminor}.so.* @@ -158,31 +149,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/gstreamer-%{majorminor}/libgstgetbits*.so* %{_libdir}/gstreamer-%{majorminor}/libgstputbits*.so* %{_libdir}/gstreamer-%{majorminor}/libgstspider*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstindexers.so - -%files tools -%defattr(-, root, root, -) -%{_bindir}/gst-complete -%{_bindir}/gst-compprep -%{_bindir}/gst-feedback -%{_bindir}/gst-inspect -%{_bindir}/gst-launch -%{_bindir}/gst-md5sum -%{_bindir}/gst-register -%{_bindir}/gst-typefind -%{_bindir}/gst-xmllaunch -%{_mandir}/man1/gst-complete.* -%{_mandir}/man1/gst-compprep.* -%{_mandir}/man1/gst-feedback.* -%{_mandir}/man1/gst-inspect.* -%{_mandir}/man1/gst-launch.* -%{_mandir}/man1/gst-md5sum.* -%{_mandir}/man1/gst-register.* -%{_mandir}/man1/gst-typefind.* -%{_mandir}/man1/gst-xmllaunch.* +%{_libdir}/gstreamer-%{majorminor}/libgstindexers.so* %files devel -%defattr(-, root, root, -) +%defattr(-,root,root,-) +%{_docdir}/%{name}-devel-%{version}/faq +%{_docdir}/%{name}-devel-%{version}/manual +%{_docdir}/%{name}-devel-%{version}/pwg %dir %{_includedir}/%{name}-%{majorminor} %dir %{_includedir}/%{name}-%{majorminor}/gst %{_includedir}/%{name}-%{majorminor}/gst/*.h @@ -194,9 +167,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_includedir}/%{name}-%{majorminor}/gst/getbits/getbits.h %dir %{_includedir}/%{name}-%{majorminor}/gst/putbits %{_includedir}/%{name}-%{majorminor}/gst/putbits/putbits.h -# %{_libdir}/libgstreamer.a %{_libdir}/libgstreamer-%{majorminor}.so %{_libdir}/libgstcontrol-%{majorminor}.so +%{_libdir}/libgstreamer-%{majorminor}.a +%{_libdir}/libgstcontrol-%{majorminor}.a %{_datadir}/aclocal/gst-element-check-%{majorminor}.m4 %{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-control-%{majorminor}.pc @@ -264,8 +238,32 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la ## this catches all of the rest of the docs we might have forgotten %{_datadir}/gtk-doc/html/* +%files tools +%defattr(-,root,root,-) +%{_bindir}/gst-complete +%{_bindir}/gst-compprep +%{_bindir}/gst-feedback +%{_bindir}/gst-inspect +%{_bindir}/gst-launch +%{_bindir}/gst-md5sum +%{_bindir}/gst-register +%{_bindir}/gst-typefind +%{_bindir}/gst-xmllaunch +%{_mandir}/man1/gst-complete.* +%{_mandir}/man1/gst-compprep.* +%{_mandir}/man1/gst-feedback.* +%{_mandir}/man1/gst-inspect.* +%{_mandir}/man1/gst-launch.* +%{_mandir}/man1/gst-md5sum.* +%{_mandir}/man1/gst-register.* +%{_mandir}/man1/gst-typefind.* +%{_mandir}/man1/gst-xmllaunch.* + %changelog +* Fri Oct 10 2003 Thomas Vander Stichele +- added dependencies for docs build + * Tue Jun 10 2003 Thomas Vander Stichele - added gst-typefind