rpms/kdemultimedia/devel kdemultimedia-4.3.2-kscd_doc.patch, NONE, 1.1 kdemultimedia.spec, 1.159, 1.160 kdemultimedia-4.3.2-misc.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-4.3.2-kscd_doc.patch 
Removed Files:
	kdemultimedia-4.3.2-misc.patch 
Log Message:
forward port recent mods to 4.3.3


kdemultimedia-4.3.2-kscd_doc.patch:
 CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdemultimedia-4.3.2-kscd_doc.patch ---
diff -up kdemultimedia-4.3.2/doc/CMakeLists.txt.me kdemultimedia-4.3.2/doc/CMakeLists.txt
--- kdemultimedia-4.3.2/doc/CMakeLists.txt.me	2009-11-10 18:08:31.000000000 +0100
+++ kdemultimedia-4.3.2/doc/CMakeLists.txt	2009-11-10 18:09:03.000000000 +0100
@@ -5,5 +5,7 @@ add_subdirectory(kioslave)
 add_subdirectory(kmix)
 add_subdirectory(dragonplayer)
 if (NOT APPLE)
-  add_subdirectory(kscd)
+  if(MUSICBRAINZ_FOUND)
+     add_subdirectory(kscd)
+  endif(MUSICBRAINZ_FOUND)
 endif (NOT APPLE)


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- kdemultimedia.spec	10 Nov 2009 17:17:16 -0000	1.159
+++ kdemultimedia.spec	11 Nov 2009 16:11:20 -0000	1.160
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.2
+Version: 4.3.3
 Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -12,7 +12,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch
-Patch2: kdemultimedia-4.3.2-misc.patch
+Patch2: kdemultimedia-4.3.2-kscd_doc.patch
 
 ## upstream patches
 
@@ -79,7 +79,7 @@ Requires: kdelibs4-devel
 %setup -q -n kdemultimedia-%{version}
 
 %patch1 -p1 -b .nomplayerthumbs
-%patch2 -p1 -b .misc
+%patch2 -p1 -b .kscd_doc
 
 %build
 
@@ -170,10 +170,13 @@ fi
 
 
 %changelog
-* Tue Nov 10 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+* Tue Nov 10 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup
 - don't install kscd doc if it's not built
 
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 


--- kdemultimedia-4.3.2-misc.patch DELETED ---