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

[Than Ngo]

Author: than

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

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-4.3.2-misc.patch 
Log Message:
- rhel cleanup                                                                          
- don't install kscd doc if it's not built 


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

--- NEW FILE kdemultimedia-4.3.2-misc.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/extras/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- kdemultimedia.spec	31 Oct 2009 23:12:22 -0000	1.158
+++ kdemultimedia.spec	10 Nov 2009 17:17:16 -0000	1.159
@@ -1,8 +1,7 @@
-
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.3
-Release: 1%{?dist}
+Version: 4.3.2
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia
@@ -13,6 +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
 
 ## upstream patches
 
@@ -26,8 +26,6 @@ BuildRequires: glib2-devel
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdelibs-experimental-devel
 BuildRequires: libtheora-devel
-## needed to build Kscd, keep for now -- Kevin
-BuildRequires: libtunepimp-devel libmusicbrainz-devel
 BuildRequires: libvorbis-devel
 # KMix PulseAudio integration is not anywhere near shippable.
 # Almost everything is commented out, it basically does nothing.
@@ -35,6 +33,8 @@ BuildRequires: libvorbis-devel
 BuildRequires: taglib-devel
 %if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel
+# needed to build Kscd, keep
+BuildRequires: libtunepimp-devel libmusicbrainz-devel
 %endif
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -51,7 +51,9 @@ The %{name} package contains multimedia 
 * dragonplayer (a simple video player)
 * juk (a music manager and player)
 * kmix (an audio mixer)
+%if 0%{?fedora}
 * kscd (an Audio-CD player)
+%endif
 
 %package libs
 License: LGPLv2+ and GPLv2+
@@ -77,7 +79,7 @@ Requires: kdelibs4-devel
 %setup -q -n kdemultimedia-%{version}
 
 %patch1 -p1 -b .nomplayerthumbs
-
+%patch2 -p1 -b .misc
 
 %build
 
@@ -131,10 +133,14 @@ fi
 %{_kde4_appsdir}/kmix/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/konqsidebartng/
+%if 0%{?fedora}
 %{_kde4_appsdir}/profiles/
 %{_kde4_appsdir}/kscd/
-%{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
 %{_kde4_appsdir}/solid/actions/kscd-play-audiocd.desktop
+%{_kde4_docdir}/HTML/en/kscd/
+%{_kde4_iconsdir}/oxygen/*/actions/kscd-dock.*
+%endif
+%{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/*
@@ -144,11 +150,9 @@ fi
 %{_kde4_docdir}/HTML/en/dragonplayer/
 %{_kde4_docdir}/HTML/en/juk/
 %{_kde4_docdir}/HTML/en/kmix/
-%{_kde4_docdir}/HTML/en/kscd/
 %{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/actions/player-volume-muted.*
-%{_kde4_iconsdir}/oxygen/*/actions/kscd-dock.*
 %{_kde4_libdir}/libkdeinit*.so
 
 %files libs
@@ -166,8 +170,9 @@ fi
 
 
 %changelog
-* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
-- 4.3.3
+* Tue Nov 10 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- rhel cleanup
+- don't install kscd doc if it's not built
 
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2