Sync F9 change up so we don't lose the change when syncing.

This commit is contained in:
Kevin Kofler 2009-02-11 00:01:43 +00:00
parent db127f9932
commit ba5b66a10a

View File

@ -34,7 +34,7 @@
Summary: A multimedia engine Summary: A multimedia engine
Name: xine-lib Name: xine-lib
Version: 1.1.16.2 Version: 1.1.16.2
Release: 1%{?dist} Release: 1%{?dist}.1
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://xinehq.de/ URL: http://xinehq.de/
@ -50,7 +50,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: %{name}-1.1.4-optflags.patch Patch1: %{name}-1.1.4-optflags.patch
Patch6: %{name}-1.1.1-deepbind-939.patch Patch6: %{name}-1.1.1-deepbind-939.patch
# FIXME for 1.1.16.1 ?
Patch7: %{name}-1.1.16-old-caca.patch Patch7: %{name}-1.1.16-old-caca.patch
# http://bugzilla.redhat.com/470568 # http://bugzilla.redhat.com/470568
Patch8: xine-lib-1.1.15-avsync_hack.patch Patch8: xine-lib-1.1.15-avsync_hack.patch
@ -188,6 +187,9 @@ This package contains extra plugins for %{name}:
%prep %prep
%setup -q %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 %patch0 -p1 -b .autotools
touch -r configure.ac aclocal.m4 touch -r configure.ac aclocal.m4
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
@ -198,6 +200,7 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4
#patch6 -p1 -b .deepbind #patch6 -p1 -b .deepbind
%if 0%{?old_caca} %if 0%{?old_caca}
sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure
%patch7 -p0 -b .old-caca %patch7 -p0 -b .old-caca
%endif %endif
@ -436,6 +439,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Feb 10 2009 Kevin Kofler <Kevin@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@fedoraproject.org> - 1.1.16.2-1 * Tue Feb 10 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.2-1
- xine-lib-1.1.16.2 - xine-lib-1.1.16.2