rpms/gstreamer-plugins/devel gstreamer-plugins.spec,1.31,1.32

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/gstreamer-plugins/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18290

Modified Files:
	gstreamer-plugins.spec 
Log Message:
- disabled building Hermes because it is not needed and doesn't
  compile with gcc4.0.  If upstream fixes it we can reenable




Index: gstreamer-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/devel/gstreamer-plugins.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gstreamer-plugins.spec	23 Mar 2005 21:55:41 -0000	1.31
+++ gstreamer-plugins.spec	27 Mar 2005 14:36:26 -0000	1.32
@@ -6,13 +6,13 @@
 Version: 0.8.8
 %define majmin 0.8
 %define po_package gst-plugins-%{majmin}
-Release: 1 
+Release: 2 
 License: LGPL
 Group: Applications/Multimedia
 Source: gst-plugins-%{version}.patched.tar.bz2
 Source2: patch-tarball.sh
 Source3: removed-sources.txt
-Source4: http://clanlib.org/download/files/Hermes-%{hermes_version}.tar.bz2
+#Source4: http://clanlib.org/download/files/Hermes-%{hermes_version}.tar.bz2
 Source5: gst-fionread.m4
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -88,25 +88,25 @@
 
 mkdir gst-libs/ext/ffmpeg
 
-for docfile in AUTHORS COPYING README ; do
-	cp Hermes-%{hermes_version}/${docfile} ${docfile}.Hermes
-done
+#for docfile in AUTHORS COPYING README ; do
+#	cp Hermes-%{hermes_version}/${docfile} ${docfile}.Hermes
+#done
 
 %build
-hermes_top=`pwd`/Hermes-install
+#hermes_top=`pwd`/Hermes-install
 
-pushd Hermes-%{hermes_version}
-aclocal
-libtoolize --force --copy
-automake
-autoconf
-CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
-./configure --disable-shared --enable-static \
-	--prefix=${hermes_top} \
-	--includedir=${hermes_top}/include \
-	--libdir=${hermes_top}/%{_lib}
-make all install
-popd
+#pushd Hermes-%{hermes_version}
+#aclocal
+#libtoolize --force --copy
+#automake
+#autoconf
+#CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
+#./configure --disable-shared --enable-static \
+#	--prefix=${hermes_top} \
+#	--includedir=${hermes_top}/include \
+#	--libdir=${hermes_top}/%{_lib}
+#make all install
+#popd
 
 cp %{SOURCE5} m4/
 aclocal -I m4  -I common/m4
@@ -114,9 +114,9 @@
 automake
 autoconf
 
-CFLAGS="$RPM_OPT_FLAGS -I${hermes_top}/include"; export CFLAGS
-CPPFLAGS="-I${hermes_top}/include"; export CPPFLAGS
-LDFLAGS="-L${hermes_top}/%{_lib}"; export LDFLAGS
+#CFLAGS="$RPM_OPT_FLAGS -I${hermes_top}/include"; export CFLAGS
+#CPPFLAGS="-I${hermes_top}/include"; export CPPFLAGS
+#LDFLAGS="-L${hermes_top}/%{_lib}"; export LDFLAGS
 
 %configure --disable-vorbistest \
 %ifnarch %{ix86}
@@ -217,7 +217,7 @@
 %{_libdir}/gstreamer-%{majmin}/libgstglimagesink.*
 %{_libdir}/gstreamer-%{majmin}/libgstgnomevfs.*
 %{_libdir}/gstreamer-%{majmin}/libgstgoom.*
-%{_libdir}/gstreamer-%{majmin}/libgsthermescolorspace.*
+#%{_libdir}/gstreamer-%{majmin}/libgsthermescolorspace.*
 %{_libdir}/gstreamer-%{majmin}/libgstidct.*
 %{_libdir}/gstreamer-%{majmin}/libgstinterleave.*
 %{_libdir}/gstreamer-%{majmin}/libgstjpeg.*
@@ -303,6 +303,10 @@
 %{_libdir}/*so
 
 %changelog
+* Sun Mar 27 2005 John (J5) Palmieri <johnp at redhat.com> - 0.8.8-2
+- disabled building Hermes because it is not needed and doesn't
+  compile with gcc4.0.  If upstream fixes it we can reenable
+  
 * Wed Mar 23 2005 John (J5) Palmieri <johnp at redhat.com> - 0.8.8-1
 - Update to upstream version 0.8.8
 - Rebuild for libmusicbrainz 2.1.1