From 96fef932be467a9343c4be156b0430f78b9f4704 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Nov 11 2009 16:11:21 +0000
Subject: forward port recent mods to 4.3.3


---

diff --git a/kdemultimedia-4.3.2-kscd_doc.patch b/kdemultimedia-4.3.2-kscd_doc.patch
new file mode 100644
index 0000000..6977000
--- /dev/null
+++ b/kdemultimedia-4.3.2-kscd_doc.patch
@@ -0,0 +1,12 @@
+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)
diff --git a/kdemultimedia-4.3.2-misc.patch b/kdemultimedia-4.3.2-misc.patch
deleted file mode 100644
index 6977000..0000000
--- a/kdemultimedia-4.3.2-misc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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)
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index c94771e..8bc2869 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -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/stable/%{version}/src/kdemultimedia-%{version
 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@redhat.com> - 4.3.2-2
+* Tue Nov 10 2009 Than Ngo <than@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@fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 05 2009 Than Ngo <than@redhat.com> - 4.3.2-1
 - 4.3.2