fix spec file

Original commit message from CVS:
fix spec file

2 files changed, 48 insertions, 76 deletions

diff --git a/ChangeLog b/ChangeLog
index 9849e43b00..e7e85d9440 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
-2004-Feb-14 Christian Schaller <Uraeus@gnome.org>
+2004-02-14  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst-ffmpeg.spec.in: fix spec file
+
+2004-02-14 Christian Schaller <Uraeus@gnome.org>
+
+	* gst-ffmpeg.spec.in: add spec file
+
+2004-02-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* creation
+
 
-	* Add SPEC file
diff --git a/gst-ffmpeg.spec.in b/gst-ffmpeg.spec.in
index d777b69492..c5534aa7a3 100644
--- a/gst-ffmpeg.spec.in
+++ b/gst-ffmpeg.spec.in
@@ -1,102 +1,64 @@
-Name: 		gstreamer-ffmpeg
+Name: 		gstreamer@GST_FFMPEG_VERSION_MAJOR@@GST_FFMPEG_VERSION_MINOR@-ffmpeg
 Version: 	@VERSION@
-Release: 	1
-Summary: 	GStreamer Streaming-media framework plug-ins.
-
-%define 	majorminor	@GST_MAJORMINOR@
-#%define 	prefix  /usr
-#%define 	sysconfdir /etc
-#Docdir: 	%{prefix}/share/doc
-#Prefix: 	%prefix
+Release:	@GST_FFMPEG_VERSION_RELEASE@	
+Summary: 	GStreamer Streaming-media framework plug-in using FFmpeg.
 
 Group: 		Libraries/Multimedia
 License: 	LGPL
 URL:		http://gstreamer.net/
-Vendor:         GStreamer Backpackers Team <package@gstreamer.net>
-Source:         http://gstreamer.net/releases/%{version}/src/gst-ffmpeg-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
+Vendor:		GStreamer Backpackers Team <package@gstreamer.net>
+Source:		http://gstreamer.net/src/gst-ffmpeg/gst-ffmpeg-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define         _glib2          @GLIB2_REQ@
+%define 	majorminor	@GST_MAJORMINOR@
 
-Requires:       glib2 >= %_glib2
-BuildRequires:  glib2-devel >= %_glib2
-Requires: 	gstreamer >= 0.6.1
-BuildRequires: 	gstreamer-devel >= 0.6.1
-BuildRequires:	gstreamer-tools >= 0.6.1
+Prereq:		%{_bindir}/gst-register-%{majorminor}
+Requires: 	gstreamer >= 0.7.4
+Requires:	gstreamer-tools >= 0.7.4
+BuildRequires: 	gstreamer-devel >= 0.7.4
 
 %description
 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
+else media-related. Its plugin-based architecture means that new data
 types or processing capabilities can be added simply by installing new
-plug-ins. This plugin contains most of the important codecs in use today.
+plug-ins.
+
+This plugin contains the FFmpeg codecs, containing codecs for most popular
+multimedia formats.
 
 %prep
-%setup -n gst-ffmpeg-%{version}
+%setup -q -n gst-ffmpeg-%{version}
+
 %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 \
-  --enable-DEBUG 
-
-if [ "$SMP" != "" ]; then
-  (make "MAKE=make -k -j $SMP"; exit 0)
-  make 2>&1 | tee make.log
-else
-  make 2>&1 | tee make.log
-fi
+%configure
+
+make %{?_smp_mflags}
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make prefix=%{?buildroot:%{buildroot}}%{_prefix} \
-     exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \
-     bindir=%{?buildroot:%{buildroot}}%{_bindir} \
-     sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \
-     sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \
-     datadir=%{?buildroot:%{buildroot}}%{_datadir} \
-     includedir=%{?buildroot:%{buildroot}}%{_includedir} \
-     libdir=%{?buildroot:%{buildroot}}%{_libdir} \
-     libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \
-     localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \
-     sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \
-     mandir=%{?buildroot:%{buildroot}}%{_mandir} \
-     infodir=%{?buildroot:%{buildroot}}%{_infodir} \
-  install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-# Clean out files that should not be part of the rpm.
-# This is the recommended way of dealing with it for RH8
+rm -rf $RPM_BUILD_ROOT
+
+%makeinstall
 rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
+
+%postun
+%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc AUTHORS COPYING README
 %{_libdir}/gstreamer-%{majorminor}/libgstffmpeg.so
 
-%Changelog
+%changelog
+* Sat Feb 14 2004 Thomas Vander Stichele <thomas at apestaart dot org>
+- Clean up spec file
+
 * Wed Jan 21 2004 Christian Schaller <Uraeus@gnome.org>
 - First version of spec