[kdemultimedia] drop xine-lib support (f16+)

Rex Dieter rdieter at fedoraproject.org
Tue Jun 14 16:57:24 UTC 2011


commit f962839fa55a9570b03f219cfe9e20653fe9ff3d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jun 14 11:57:14 2011 -0500

    drop xine-lib support (f16+)

 kdemultimedia.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 9165472..e9b57e7 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -1,6 +1,7 @@
 
 %if 0%{?fedora}
 %global kscd 1
+%global tunepimp 1
 %endif
 
 %if 0%{?fedora} < 16
@@ -10,7 +11,7 @@
 Name:    kdemultimedia
 Epoch:   6
 Version: 4.6.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Multimedia applications
 
 Group:   Applications/Multimedia
@@ -24,9 +25,6 @@ Patch1: kdemultimedia-4.6.2-no_thumbs.patch
 
 ## upstream patches
 
-# This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
-# FLAC_OGG_LIBRARY:FILEPATH=FLAC_OGG_LIBRARY-NOTFOUND
-
 BuildRequires: alsa-lib-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: flac-devel
@@ -36,9 +34,11 @@ BuildRequires: libtheora-devel
 BuildRequires: libvorbis-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: taglib-devel
-%if 0%{?fedora}
-# dragonplayer, dvd menus
+%if 0%{?fedora} && 0%{?fedora} < 16
+# dragonplayer, xine dvd menus
 BuildRequires: xine-lib-devel libxcb-devel
+%endif
+%if 0%{?tunepimp}
 # juk/kscd
 BuildRequires: libtunepimp-devel
 %endif
@@ -388,6 +388,9 @@ fi
 
 
 %changelog
+* Tue Jun 14 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.6.80-2
+- drop xine-lib support (f16+)
+
 * Tue Jun 14 2011 Jaroslav Reznik <jreznik at redhat.com> 6:4.6.80-1
 - 4.6.80 (beta1)
 


More information about the scm-commits mailing list