rpms/kdemultimedia/devel kdemultimedia-4.2.3-noxine.patch, NONE, 1.1 kdemultimedia.spec, 1.147, 1.148

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11367

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/devel/kdemultimedia.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- kdemultimedia.spec	5 Jun 2009 02:59:18 -0000	1.147
+++ kdemultimedia.spec	5 Jun 2009 11:41:58 -0000	1.148
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.2.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia
@@ -11,6 +11,7 @@ URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: kdemultimedia-4.2.3-noxine.patch
 Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch
 
 ## upstream patches
@@ -73,6 +74,7 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -n kdemultimedia-%{version}
 
+%patch0 -p1 -b .noxine
 %patch1 -p1 -b .nomplayerthumbs
 
 
@@ -163,6 +165,9 @@ fi
 
 
 %changelog
+* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.2.90-2
+- fix build issue without xine-lib
+
 * Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
 - KDE-4.3 beta2 (4.2.90)