more fixes

Original commit message from CVS:
more fixes

1 files changed, 48 insertions, 146 deletions

diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index 46e5fca8..096c038b 100644
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -33,10 +33,14 @@ BuildRequires:	gstreamer-tools >= 0.7.4
 @USE_ESD_TRUE@
 @USE_ESD_TRUE@Provides:		gstreamer-audiosrc
 @USE_ESD_TRUE@Provides:		gstreamer-audiosink
+@USE_FLAC_TRUE@Requires:      flac >= 1.0.3
+@USE_FLAC_TRUE@BuildRequires: flac-devel >= 1.0.3
 @USE_GCONF_TRUE@Requires: 	GConf2
 @USE_GCONF_TRUE@BuildRequires: 	GConf2-devel
 @USE_GNOME_VFS_TRUE@Requires:      gnome-vfs2 > 1.9.4.00
 @USE_GNOME_VFS_TRUE@BuildRequires: gnome-vfs2-devel > 1.9.4.00
+@USE_HERMES_TRUE@Requires:      Hermes => 1.3.0
+@USE_HERMES_TRUE@BuildRequires: Hermes-devel => 1.3.0
 @USE_JPEG_TRUE@Requires:      libjpeg
 @USE_JPEG_TRUE@BuildRequires: libjpeg-devel
 @USE_LIBPNG_TRUE@Requires:      libpng >= 1.2.0
@@ -66,39 +70,6 @@ BuildRequires:	gstreamer-tools >= 0.7.4
 # Snapshot plugin
 @USE_HERMES_TRUE@@USE_LIBPNG_TRUE@Requires:	libpng
 
-Obsoletes:	gstreamer-plugin-libs
-Obsoletes:	gstreamer-arts
-Obsoletes:	gstreamer-artsd
-Obsoletes:	gstreamer-audiofile
-Obsoletes:	gstreamer-cdparanoia
-Obsoletes:	gstreamer-esound
-Obsoletes:	gstreamer-gnomevfs
-Obsoletes:	gstreamer-jpeg
-Obsoletes:	gstreamer-libpng
-Obsoletes:	gstreamer-mikmod
-Obsoletes:	gstreamer-oss
-Obsoletes:	gstreamer-raw1394
-Obsoletes:	gstreamer-SDL
-Obsoletes:	gstreamer-vorbis
-Obsoletes:	gstreamer-v4l
-Obsoletes:	gstreamer-xvideosink
-Obsoletes:	gstreamer-audio-effects
-Obsoletes:	gstreamer-audio-formats
-Obsoletes:	gstreamer-festival
-Obsoletes:	gstreamer-flx
-Obsoletes:	gstreamer-qcam
-Obsoletes:	gstreamer-udp
-Obsoletes:	gstreamer-vcd
-Obsoletes:	gstreamer-video-effects
-Obsoletes:	gstreamer-visualisation
-Obsoletes:	gstreamer-yuv4mjpeg
-Obsoletes:	gstreamer-cdplayer
-Obsoletes:	gstreamer-videotest
-Obsoletes:	gstreamer-rtp
-Obsoletes:	gstreamer-snapshot
-Obsoletes:	gstreamer-GConf
-Obsoletes:	gstreamer-play
-
 %description
 GStreamer is a streaming-media framework, based on graphs of filters which
 operate on media data. Applications using this library can do anything
@@ -245,7 +216,9 @@ rm -rf $RPM_BUILD_ROOT
 @USE_AUDIOFILE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstaudiofile.so
 @USE_CDPARANOIA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so
 @USE_ESD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstesd.so
+@USE_FLAC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstflac.so
 @USE_GNOME_VFS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgnomevfs.so
+@USE_HERMES_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsthermescolorspace.so
 @USE_SMOOTHWAVE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsmooth.so
 @USE_JPEG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so
 @USE_MIKMOD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmikmod.so
@@ -261,6 +234,7 @@ rm -rf $RPM_BUILD_ROOT
 @USE_LIBPNG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsnapshot.so
 @USE_PANGO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsttextoverlay.so
 @USE_PANGO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsttimeoverlay.so
+@USE_SPEEX_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstspeex.so
 @USE_LIBCACA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so
 @USE_XVIDEO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstximagesink.so
 @USE_XVIDEO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstxvimagesink.so
@@ -397,7 +371,6 @@ GStreamer support libraries header files.
 @USE_ALSA_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 @USE_ALSA_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
-
 ### DVDREAD ###
 @USE_DVDREAD_TRUE@%package -n gstreamer-libdvdread
 @USE_DVDREAD_TRUE@Summary:       GStreamer plug-in for DVD playback.
@@ -471,28 +444,27 @@ GStreamer support libraries header files.
 @USE_DXR3_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 @USE_DXR3_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
-### FLAC ###
-@USE_FLAC_TRUE@%package -n gstreamer-flac
-@USE_FLAC_TRUE@Summary:       GStreamer plug-in for FLAC lossless audio.
-@USE_FLAC_TRUE@Group:         Libraries/Multimedia
-@USE_FLAC_TRUE@Requires:      gstreamer-plugins = %{version}
-@USE_FLAC_TRUE@Requires:      flac >= 1.0.3
-@USE_FLAC_TRUE@BuildRequires: flac-devel >= 1.0.3
-@USE_FLAC_TRUE@
-@USE_FLAC_TRUE@%description -n gstreamer-flac
-@USE_FLAC_TRUE@Plug-in for the free FLAC lossless audio format.
-@USE_FLAC_TRUE@
-@USE_FLAC_TRUE@%files -n gstreamer-flac
-@USE_FLAC_TRUE@%defattr(-, root, root)
-@USE_FLAC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstflac.so
-@USE_FLAC_TRUE@
-@USE_FLAC_TRUE@%post -n gstreamer-flac
-@USE_FLAC_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-@USE_FLAC_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
-@USE_FLAC_TRUE@
-@USE_FLAC_TRUE@%postun -n gstreamer-flac
-@USE_FLAC_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-@USE_FLAC_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
+### FAAD ###
+@USE_FAAD_TRUE@%package -n gstreamer-faad
+@USE_FAAD_TRUE@Summary:GStreamer plug-ins for AAC audio playback.
+@USE_FAAD_TRUE@Group:         Libraries/Multimedia
+@USE_FAAD_TRUE@Requires:      gstreamer-plugins = %{version}
+@USE_FAAD_TRUE@Requires:      faad2 => 2.0
+@USE_FAAD_TRUE@BuildRequires: faad2-devel => 2.0
+@USE_FAAD_TRUE@
+@USE_FAAD_TRUE@%description -n gstreamer-faad
+@USE_FAAD_TRUE@Plug-ins for playing AAC audio
+@USE_FAAD_TRUE@
+@USE_FAAD_TRUE@%files -n gstreamer-faad
+@USE_FAAD_TRUE@%defattr(-, root, root)
+@USE_FAAD_TRUE@/usr/lib/gstreamer-%{majorminor}/libgstfaad.so
+@USE_FAAD_TRUE@%post -n  gstreamer-faad
+@USE_FAAD_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
+@USE_FAAD_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
+@USE_FAAD_TRUE@
+@USE_FAAD_TRUE@%postun -n  gstreamer-faad
+@USE_FAAD_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
+@USE_FAAD_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
 ### GSM ###
 @USE_GSM_TRUE@%package -n gstreamer-gsm
@@ -517,28 +489,6 @@ GStreamer support libraries header files.
 @USE_GSM_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 @USE_GSM_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
-### HERMES ###
-@USE_HERMES_TRUE@%package -n gstreamer-colorspace
-@USE_HERMES_TRUE@Summary:       GStreamer colorspace conversion plug-in.
-@USE_HERMES_TRUE@Group:         Libraries/Multimedia
-@USE_HERMES_TRUE@Requires:      gstreamer-plugins = %{version}
-@USE_HERMES_TRUE@Requires:      Hermes => 1.3.0
-@USE_HERMES_TRUE@BuildRequires: Hermes-devel => 1.3.0
-@USE_HERMES_TRUE@%description -n gstreamer-colorspace
-@USE_HERMES_TRUE@Colorspace plug-in based on Hermes library.
-@USE_HERMES_TRUE@
-@USE_HERMES_TRUE@%files -n gstreamer-colorspace
-@USE_HERMES_TRUE@%defattr(-, root, root)
-@USE_HERMES_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsthermescolorspace.so
-@USE_HERMES_TRUE@
-@USE_HERMES_TRUE@%post -n gstreamer-colorspace
-@USE_HERMES_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-@USE_HERMES_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
-@USE_HERMES_TRUE@
-@USE_HERMES_TRUE@%postun -n gstreamer-colorspace
-@USE_HERMES_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-@USE_HERMES_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
-
 #### JACK AUDIO CONNECTION KIT ###
 @USE_JACK_TRUE@%package -n gstreamer-jack
 @USE_JACK_TRUE@Summary:  GStreamer plug-in for the Jack Sound Server.
@@ -585,29 +535,6 @@ GStreamer support libraries header files.
 @USE_LIBCACA_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 @USE_LIBCACA_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
-
-#### NETWORK AUDIO SYSTEM  ###
-@USE_NAS_TRUE@%package -n gstreamer-nas
-@USE_NAS_TRUE@Summary:  GStreamer plug-in for the Network Audio System.
-@USE_NAS_TRUE@Group:    Libraries/Multimedia
-@USE_NAS_TRUE@Requires: gstreamer-plugins = %{version}
-@USE_NAS_TRUE@Requires: libnas2 => 1.6
-@USE_NAS_TRUE@
-@USE_NAS_TRUE@%description -n gstreamer-nas
-@USE_NAS_TRUE@Plug-in for the Network Audio System sound server.
-@USE_NAS_TRUE@
-@USE_NAS_TRUE@%files -n gstreamer-nas
-@USE_NAS_TRUE@%defattr(-, root, root)
-@USE_NAS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstnassink.so
-@USE_NAS_TRUE@
-@USE_NAS_TRUE@%post -n gstreamer-nas
-@USE_NAS_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-@USE_NAS_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
-@USE_NAS_TRUE@
-@USE_NAS_TRUE@%postun -n gstreamer-nas
-@USE_NAS_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-
-
 ### LADSPA ###
 @USE_LADSPA_TRUE@%package -n gstreamer-ladspa
 @USE_LADSPA_TRUE@Summary:       GStreamer wrapper for LADSPA plug-ins.
@@ -677,7 +604,6 @@ GStreamer support libraries header files.
 @USE_LIBDV_TRUE@%postun -n gstreamer-dv
 @USE_LIBDV_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 
-
 ### LIBFAME ###
 @USE_LIBFAME_TRUE@%package -n gstreamer-libfame
 @USE_LIBFAME_TRUE@Summary:       GStreamer plug-in to encode MPEG1/MPEG4 video.
@@ -748,27 +674,26 @@ GStreamer support libraries header files.
 @USE_MPEG2DEC_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 @USE_MPEG2DEC_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
-### FAAD ###
-@USE_FAAD_TRUE@%package -n gstreamer-faad
-@USE_FAAD_TRUE@Summary:GStreamer plug-ins for AAC audio playback.
-@USE_FAAD_TRUE@Group:         Libraries/Multimedia
-@USE_FAAD_TRUE@Requires:      gstreamer-plugins = %{version}
-@USE_FAAD_TRUE@Requires:      faad2 => 2.0
-@USE_FAAD_TRUE@BuildRequires: faad2-devel => 2.0
-@USE_FAAD_TRUE@
-@USE_FAAD_TRUE@%description -n gstreamer-faad
-@USE_FAAD_TRUE@Plug-ins for playing AAC audio
-@USE_FAAD_TRUE@
-@USE_FAAD_TRUE@%files -n gstreamer-faad
-@USE_FAAD_TRUE@%defattr(-, root, root)
-@USE_FAAD_TRUE@/usr/lib/gstreamer-%{majorminor}/libgstfaad.so
-@USE_FAAD_TRUE@%post -n  gstreamer-faad
-@USE_FAAD_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-@USE_FAAD_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
-@USE_FAAD_TRUE@
-@USE_FAAD_TRUE@%postun -n  gstreamer-faad
-@USE_FAAD_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-@USE_FAAD_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
+#### NETWORK AUDIO SYSTEM  ###
+@USE_NAS_TRUE@%package -n gstreamer-nas
+@USE_NAS_TRUE@Summary:  GStreamer plug-in for the Network Audio System.
+@USE_NAS_TRUE@Group:    Libraries/Multimedia
+@USE_NAS_TRUE@Requires: gstreamer-plugins = %{version}
+@USE_NAS_TRUE@Requires: libnas2 => 1.6
+@USE_NAS_TRUE@
+@USE_NAS_TRUE@%description -n gstreamer-nas
+@USE_NAS_TRUE@Plug-in for the Network Audio System sound server.
+@USE_NAS_TRUE@
+@USE_NAS_TRUE@%files -n gstreamer-nas
+@USE_NAS_TRUE@%defattr(-, root, root)
+@USE_NAS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstnassink.so
+@USE_NAS_TRUE@
+@USE_NAS_TRUE@%post -n gstreamer-nas
+@USE_NAS_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
+@USE_NAS_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
+@USE_NAS_TRUE@
+@USE_NAS_TRUE@%postun -n gstreamer-nas
+@USE_NAS_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 
 ### SIDPLAY ###
 @USE_SIDPLAY_TRUE@%package -n gstreamer-sid
@@ -816,29 +741,6 @@ GStreamer support libraries header files.
 @USE_SHOUT_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 @USE_SHOUT_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
-### SPEEX ###
-@USE_SPEEX_TRUE@%package -n gstreamer-speex
-@USE_SPEEX_TRUE@Summary:       GStreamer plug-in for SPEEX audio.
-@USE_SPEEX_TRUE@Group:         Libraries/Multimedia
-@USE_SPEEX_TRUE@Requires:      gstreamer-plugins = %{version}
-@USE_SPEEX_TRUE@Requires:      speex >= 1.0.3
-@USE_SPEEX_TRUE@BuildRequires: speex-devel >= 1.0.3
-@USE_SPEEX_TRUE@
-@USE_SPEEX_TRUE@%description -n gstreamer-speex
-@USE_SPEEX_TRUE@Plug-in for the free SPEEX speech compression.
-@USE_SPEEX_TRUE@
-@USE_SPEEX_TRUE@%files -n gstreamer-speex
-@USE_SPEEX_TRUE@%defattr(-, root, root)
-@USE_SPEEX_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstspeex.so
-@USE_SPEEX_TRUE@
-@USE_SPEEX_TRUE@%post -n gstreamer-speex
-@USE_SPEEX_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-@USE_SPEEX_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
-@USE_SPEEX_TRUE@
-@USE_SPEEX_TRUE@%postun -n gstreamer-speex
-@USE_SPEEX_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-@USE_SPEEX_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
-
 ### SWFDEC FLASH PLUGIN ###
 @USE_SWFDEC_TRUE@%package -n gstreamer-swfdec
 @USE_SWFDEC_TRUE@Summary:  GStreamer Flash redering plug-in.