rpms/xine-lib/F-9 xine-lib.spec, 1.55, 1.56 xine-lib-1.1.16-old-caca.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Fri Apr 17 16:49:18 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/xine-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12711
Modified Files:
xine-lib.spec
Removed Files:
xine-lib-1.1.16-old-caca.patch
Log Message:
* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2.1
- drop old_caca hacks/patches (F-9)
Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xine-lib.spec 10 Apr 2009 18:42:53 -0000 1.55
+++ xine-lib.spec 17 Apr 2009 16:48:48 -0000 1.56
@@ -13,10 +13,6 @@
%define have_vidix 0
%endif # ix86
-%if 0%{?fedora} <= 9
- %define old_caca 1
-%endif
-
%if 0%{?fedora}
%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
%define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
@@ -34,7 +30,7 @@
Summary: A multimedia engine
Name: xine-lib
Version: 1.1.16.3
-Release: 2%{?dist}
+Release: 2%{?dist}.1
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -50,7 +46,6 @@
Patch1: %{name}-1.1.4-optflags.patch
Patch6: %{name}-1.1.1-deepbind-939.patch
-Patch7: %{name}-1.1.16-old-caca.patch
# http://bugzilla.redhat.com/470568
Patch8: xine-lib-1.1.15-avsync_hack.patch
# http://bugzilla.redhat.com/477226
@@ -79,11 +74,7 @@
%if %{with_aalib}
BuildRequires: aalib-devel >= 1.4
%endif # aalib
-%if 0%{?old_caca}
-BuildRequires: libcaca-devel >= 0.99
-%else
BuildRequires: libcaca-devel >= 0.99-0.5.beta14
-%endif
%if 0%{!?_without_directfb:1}
BuildRequires: directfb-devel
%endif # directfb
@@ -190,9 +181,6 @@
%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
@@ -202,11 +190,6 @@
# see also http://bugzilla.redhat.com/480504 for side-effects
#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
-
%patch8 -p1 -b .avsync_hack
%patch9 -p1 -b .multilib
%patch50 -p1 -b .mod_mimetypes_typo
@@ -442,6 +425,9 @@
%changelog
+* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2.1
+- drop old_caca hacks/patches (F-9)
+
* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
- fix modtracker mimetypes
--- xine-lib-1.1.16-old-caca.patch DELETED ---
More information about the fedora-extras-commits
mailing list