rpms/xine-lib/devel xine-lib.spec,1.66,1.67

Kevin Kofler kkofler at fedoraproject.org
Wed Feb 11 00:02:14 UTC 2009


Author: kkofler

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11020/devel

Modified Files:
	xine-lib.spec 
Log Message:
Sync F9 change up so we don't lose the change when syncing.


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- xine-lib.spec	10 Feb 2009 23:03:37 -0000	1.66
+++ xine-lib.spec	11 Feb 2009 00:01:43 -0000	1.67
@@ -34,7 +34,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,7 +50,6 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
-# FIXME for 1.1.16.1 ?
 Patch7:         %{name}-1.1.16-old-caca.patch
 # http://bugzilla.redhat.com/470568
 Patch8:         xine-lib-1.1.15-avsync_hack.patch
@@ -188,6 +187,9 @@
 
 %prep
 %setup -q
+%if 0%{?old_caca}
+sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure.ac
+%endif
 %patch0 -p1 -b .autotools
 touch -r configure.ac aclocal.m4
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
@@ -198,6 +200,7 @@
 #patch6 -p1 -b .deepbind
 
 %if 0%{?old_caca}
+sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure
 %patch7 -p0 -b .old-caca
 %endif
 
@@ -436,6 +439,9 @@
 
 
 %changelog
+* Tue Feb 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16.2-1.1
+- also patch the caca version check in configure(.ac)
+
 * Tue Feb 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-1
 - xine-lib-1.1.16.2
 




More information about the fedora-extras-commits mailing list