rpms/kdemultimedia/F-11 kdemultimedia-4.2.3-noxine.patch, NONE, 1.1 kdemultimedia.spec, 1.142, 1.143

Than Ngo than at fedoraproject.org
Fri Jun 5 11:23:57 UTC 2009


Author: than

Update of /cvs/extras/rpms/kdemultimedia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7127

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-4.2.3-noxine.patch 
Log Message:
fix build issue without xine-lib



kdemultimedia-4.2.3-noxine.patch:

--- NEW FILE kdemultimedia-4.2.3-noxine.patch ---
diff -up kdemultimedia-4.2.3/doc/CMakeLists.txt.orig kdemultimedia-4.2.3/doc/CMakeLists.txt
--- kdemultimedia-4.2.3/doc/CMakeLists.txt.orig	2009-06-01 00:20:29.000000000 +0200
+++ kdemultimedia-4.2.3/doc/CMakeLists.txt	2009-06-01 00:20:39.000000000 +0200
@@ -3,9 +3,7 @@ if (TAGLIB_FOUND)
 endif(TAGLIB_FOUND)
 add_subdirectory(kioslave)
 add_subdirectory(kmix)
-if(XINE_XCB_FOUND)
-  add_subdirectory(dragonplayer)
-endif(XINE_XCB_FOUND)
+add_subdirectory(dragonplayer)
 if (NOT APPLE)
   add_subdirectory(kscd)
 endif (NOT APPLE)


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-11/kdemultimedia.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- kdemultimedia.spec	30 May 2009 14:06:26 -0000	1.142
+++ kdemultimedia.spec	5 Jun 2009 11:23:27 -0000	1.143
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia
@@ -9,6 +9,7 @@ Group:   Applications/Multimedia
 License: GPLv2+
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+Patch0:  kdemultimedia-4.2.3-noxine.patch
 # upstream patches
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +25,7 @@ BuildRequires: libtheora-devel
 BuildRequires: libtunepimp-devel libmusicbrainz-devel
 BuildRequires: libvorbis-devel
 BuildRequires: taglib-devel
-BuildRequires: xine-lib-devel libxcb-devel
+BuildRequires: libxcb-devel
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4 >= %{version}
@@ -64,6 +65,7 @@ Requires: kdelibs4-devel
 
 %prep
 %setup -q -n kdemultimedia-%{version}
+%patch0 -p1 -b .xinelib
 
 %build
 
@@ -151,6 +153,9 @@ fi
 
 
 %changelog
+* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.2.4-2
+- fix build issue without xine-lib
+
 * Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
 - KDE 4.2.4
 




More information about the fedora-extras-commits mailing list