cleanups in preparation of the release

Original commit message from CVS:
cleanups in preparation of the release

diff --git a/gstreamer.spec.in b/gstreamer.spec.in
index 0646bed..de68104 100644 (file)
--- a/gstreamer.spec.in
+++ b/gstreamer.spec.in
@@ -3,7 +3,7 @@ Name:           gstreamer
 Version:       @VERSION@
 Release:       @GST_VERSION_RELEASE@
 
-Copyright:     LGPL
+License:       LGPL
 Group:                 Libraries/Multimedia
 Source:        %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
@@ -34,9 +34,87 @@ else media-related.  Its plugin-based architecture means that new data
 types or processing capabilities can be added simply by installing new 
 plugins.
 
+%package devel
+Summary:       Libraries/include files for GStreamer streaming media framework
+Group:                 Development/Libraries
+
+Requires:      %{name} = %{version}-%{release}
+Requires:      glib2-devel >= %_glib2
+Requires:      libxml2-devel >= %_libxml2
+
+%description devel
+GStreamer is a streaming-media framework, based on graphs of filters which
+operate on media data. Applications using this library can do anything
+from real-time sound processing to playing videos, and just about anything
+else media-related.  Its plugin-based architecture means that new data
+types or processing capabilities can be added simply by installing new   
+plugins.
+
+This package contains the libraries and includes files necessary to develop
+applications and plugins for GStreamer.
+
+%prep
+%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} \
+  --enable-debug \
+  --with-configdir=/etc/gstreamer \
+  --disable-tests --disable-examples --disable-debug-color \
+  --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
+
+%install  
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+# adding devhelp stuff here for now, need to integrate better
+# when devhelp allows it
+mkdir -p $RPM_BUILD_ROOT/usr/share/devhelp/specs
+cp $RPM_BUILD_DIR/%{name}-%{version}/docs/devhelp/*.devhelp $RPM_BUILD_ROOT/usr/share/devhelp/specs
+
+%makeinstall
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+%{_prefix}/bin/gst-register --gst-mask=0
+
+%post devel
+# adding devhelp links to work around different base not working
+mkdir -p %{_datadir}/devhelp/books
+ln -sf %{_datadir}/gtk-doc/html/gstreamer %{_datadir}/devhelp/books
+ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
+
+%postun
+/sbin/ldconfig
+
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING README TODO COPYING.LIB ABOUT-NLS REQUIREMENTS DOCBUILDING 
+%doc AUTHORS COPYING README TODO \
+     COPYING.LIB ABOUT-NLS REQUIREMENTS DOCBUILDING 
 %{_bindir}/gst-complete
 %{_bindir}/gst-compprep
 %{_bindir}/gst-inspect
@@ -61,23 +139,6 @@ plugins.
 %{_mandir}/man1/gst-launch.*
 %{_mandir}/man1/gst-register.*
 
-%package devel
-Summary: Libraries and include files for GStreamer streaming-media framework
-Group: Development/Libraries
-Requires: %{name} = %{version}
-Requires: glib2-devel >= %_glib2
-Requires: libxml2-devel >= %_libxml2
-
-%description devel
-GStreamer is a streaming-media framework, based on graphs of filters which
-operate on media data. Applications using this library can do anything
-from real-time sound processing to playing videos, and just about anything
-else media-related.  Its plugin-based architecture means that new data
-types or processing capabilities can be added simply by installing new   
-plugins.
-
-This package contains the libraries and includes files necessary to develop
-applications and plugins for GStreamer.
 
 %files devel
 %defattr(-, root, root)
@@ -86,12 +147,67 @@ applications and plugins for GStreamer.
 %{_libdir}/libgstreamer.la
 %{_libdir}/libgstreamer.so
 %{_libdir}/pkgconfig/*
+## we specify the API docs as regular files since %docs doesn't fail when
+## files aren't found anymore for RPM >= 4
+## we list all of the files we really need to trap incomplete doc builds
+## gstreamer API
+%{_datadir}/gtk-doc/html/gstreamer/autopluggers.html
+%{_datadir}/gtk-doc/html/gstreamer/book1.html
+%{_datadir}/gtk-doc/html/gstreamer/element-types.html
+%{_datadir}/gtk-doc/html/gstreamer/gstautoplugfactory.html
+%{_datadir}/gtk-doc/html/gstreamer/gstautoplug.html
+%{_datadir}/gtk-doc/html/gstreamer/gstbin.html
+%{_datadir}/gtk-doc/html/gstreamer/gstclock.html
+%{_datadir}/gtk-doc/html/gstreamer/gstelement.html
+%{_datadir}/gtk-doc/html/gstreamer/gst-index.html
+%{_datadir}/gtk-doc/html/gstreamer/gstobject.html
+%{_datadir}/gtk-doc/html/gstreamer/gstpad.html
+%{_datadir}/gtk-doc/html/gstreamer/gstpipeline.html
+%{_datadir}/gtk-doc/html/gstreamer/gstpluginfeature.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-cothreads.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstbuffer.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstbufferpool.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstcaps.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstcpu.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstdata.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstevent.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gst.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstinfo.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstpad-template.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstparse.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstplugin.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstprops.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gststaticautoplug.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gststaticautoplugrender.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gsttee.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gsttype.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstutils.html
+%{_datadir}/gtk-doc/html/gstreamer/gstreamer.html
+%{_datadir}/gtk-doc/html/gstreamer/gstschedulerfactory.html
+%{_datadir}/gtk-doc/html/gstreamer/gstscheduler.html
+%{_datadir}/gtk-doc/html/gstreamer/gstthread.html
+%{_datadir}/gtk-doc/html/gstreamer/gsttimecache.html
+%{_datadir}/gtk-doc/html/gstreamer/gsttypefactory.html
+%{_datadir}/gtk-doc/html/gstreamer/gstxml.html
+%{_datadir}/gtk-doc/html/gstreamer/index.sgml
+## gstreamer-libs API
+%{_datadir}/gtk-doc/html/gstreamer-libs/book1.html
+%{_datadir}/gtk-doc/html/gstreamer-libs/gstreamer-libs-gstcolorspace.html
+%{_datadir}/gtk-doc/html/gstreamer-libs/gstreamer-libs-gstgetbits.html
+%{_datadir}/gtk-doc/html/gstreamer-libs/gstreamer-libs.html
+%{_datadir}/gtk-doc/html/gstreamer-libs/index.sgml
+## this catches all of the rest of the docs we might have forgotten
 %{_datadir}/gtk-doc/html/*
 %{_datadir}/devhelp/specs/gstreamer.devhelp
 %{_datadir}/devhelp/specs/gstreamer-libs.devhelp
 
 
 %changelog
+* Fri Jun 07 2002 Thomas Vander Stichele <thomas@apestaart.org>
+- added release of gstreamer to req of gstreamer-devel
+- changed location of API docs to be in gtk-doc like other gtk-doc stuff
+- reordered SPEC file
+
 * Mon Apr 29 2002 Thomas Vander Stichele <thomas@apestaart.org>
 - moved html docs to gtk-doc standard directory
 
@@ -122,7 +238,7 @@ applications and plugins for GStreamer.
 - Improve spec file
 
 * Sat Dec 15 2001 Christian Schaller <Uraeus@linuxrising.org>
-- Splitt of more plugins from the core and put them into their own modules
+- Split of more plugins from the core and put them into their own modules
 - Includes colorspace, xfree and wav
 - Improved package Require lines
 - Added mp3encode (lame based) to the SPEC
@@ -148,7 +264,8 @@ applications and plugins for GStreamer.
 - Moved files sections up close to their respective descriptions
 
 * Sat Jun 02 2001 Christian Schaller <Uraeus@linuxrising.org>
-- Split the package into separate RPMS, plutting most plugins out by themselves.
+- Split the package into separate RPMS, 
+  putting most plugins out by themselves.
 
 * Fri Jun 01 2001 Christian Schaller <Uraeus@linuxrising.org>
 - Updated with change suggestions from Dennis Bjorklund
@@ -159,59 +276,3 @@ applications and plugins for GStreamer.
 * Sun Jan 30 2000 Erik Walthinsen <omega@cse.ogi.edu>
 - first draft of spec file
 
-%prep
-%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} \
-  --enable-debug \
-  --with-configdir=/etc/gstreamer \
-  --disable-tests --disable-examples --disable-debug-color \
-  --enable-docs-build
-if [ "$SMP" != "" ]; then
-  (make "MAKE=make -k -j $SMP"; exit 0)
-else
-  make
-fi
-
-%install  
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-# adding devhelp stuff here for now, need to integrate better
-# when devhelp allows it
-mkdir -p $RPM_BUILD_ROOT/usr/share/devhelp/specs
-cp $RPM_BUILD_DIR/%{name}-%{version}/docs/devhelp/*.devhelp $RPM_BUILD_ROOT/usr/share/devhelp/specs
-
-%makeinstall
-
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/ldconfig
-%{_prefix}/bin/gst-register --gst-mask=0
-
-%post devel
-# adding devhelp links to work around different base not working
-mkdir -p %{_datadir}/devhelp/books
-ln -sf %{_datadir}/gtk-doc/html/gstreamer %{_datadir}/devhelp/books
-ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
-
-%postun
-/sbin/ldconfig