rpms/kdemultimedia/devel kdemultimedia-4.3.75-kscd_doc.patch, NONE, 1.1 kdemultimedia-4.3.75-nomplayerthumbs.patch, NONE, 1.1 .cvsignore, 1.72, 1.73 kdemultimedia.spec, 1.160, 1.161 sources, 1.72, 1.73 kdemultimedia-4.2.85-nomplayerthumbs.patch, 1.1, NONE kdemultimedia-4.3.2-kscd_doc.patch, 1.1, NONE

[Ben Boeckel]

Author: mathstuf

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

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Added Files:
	kdemultimedia-4.3.75-kscd_doc.patch 
	kdemultimedia-4.3.75-nomplayerthumbs.patch 
Removed Files:
	kdemultimedia-4.2.85-nomplayerthumbs.patch 
	kdemultimedia-4.3.2-kscd_doc.patch 
Log Message:
Update to 4.3.75

kdemultimedia-4.3.75-kscd_doc.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdemultimedia-4.3.75-kscd_doc.patch ---
diff -r -U5 kdemultimedia-4.3.75svn1048496/doc/CMakeLists.txt kdemultimedia-4.3.75svn1048496.kscd_doc/doc/CMakeLists.txt
--- kdemultimedia-4.3.75svn1048496/doc/CMakeLists.txt	2009-10-06 17:37:54.000000000 -0400
+++ kdemultimedia-4.3.75svn1048496.kscd_doc/doc/CMakeLists.txt	2009-11-23 22:04:55.000000000 -0500
@@ -9,9 +9,9 @@
 endif()
 if(BUILD_dragonplayer)
   add_subdirectory(dragonplayer)
 endif()
 if (NOT APPLE)
-  if(BUILD_kscd)
+  if(BUILD_kscd AND MUSICBRAINZ_FOUND)
     add_subdirectory(kscd)
-  endif()
+  endif(BUILD_kscd AND MUSICBRAINZ_FOUND)
 endif (NOT APPLE)

kdemultimedia-4.3.75-nomplayerthumbs.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdemultimedia-4.3.75-nomplayerthumbs.patch ---
diff -r -U5 kdemultimedia-4.3.75svn1048496/CMakeLists.txt kdemultimedia-4.3.75svn1048496.nomplayerthumbs/CMakeLists.txt
--- kdemultimedia-4.3.75svn1048496/CMakeLists.txt	2009-10-26 05:15:52.000000000 -0400
+++ kdemultimedia-4.3.75svn1048496.nomplayerthumbs/CMakeLists.txt	2009-11-23 20:40:19.000000000 -0500
@@ -35,11 +35,11 @@
 include (ConfigureChecks.cmake)
 configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 
 add_subdirectory(libkcddb)
 add_subdirectory(libkcompactdisc)
-add_subdirectory(mplayerthumbs)
+#add_subdirectory(mplayerthumbs)
 
 if (TAGLIB_FOUND)
   macro_optional_add_subdirectory(juk)
 endif(TAGLIB_FOUND)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	31 Oct 2009 23:12:22 -0000	1.72
+++ .cvsignore	24 Nov 2009 16:55:28 -0000	1.73
@@ -1 +1 @@
-kdemultimedia-4.3.3.tar.bz2
+kdemultimedia-4.3.75svn1048496.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- kdemultimedia.spec	11 Nov 2009 16:11:20 -0000	1.160
+++ kdemultimedia.spec	24 Nov 2009 16:55:28 -0000	1.161
@@ -1,18 +1,20 @@
+%define alphatag svn1048496
+
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.3
-Release: 2%{?dist}
+Version: 4.3.75
+Release: 0.1.%{alphatag}%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia
 # see also: http://techbase.kde.org/Policies/Licensing_Policy
 License: GPLv2+
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}%{?alphatag}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch
-Patch2: kdemultimedia-4.3.2-kscd_doc.patch
+Patch1: kdemultimedia-4.3.75-nomplayerthumbs.patch
+Patch2: kdemultimedia-4.3.75-kscd_doc.patch
 
 ## upstream patches
 
@@ -76,7 +78,7 @@ Requires: kdelibs4-devel
 
 
 %prep
-%setup -q -n kdemultimedia-%{version}
+%setup -q -n kdemultimedia-%{version}%{?alphatag}
 
 %patch1 -p1 -b .nomplayerthumbs
 %patch2 -p1 -b .kscd_doc
@@ -137,6 +139,7 @@ fi
 %{_kde4_appsdir}/profiles/
 %{_kde4_appsdir}/kscd/
 %{_kde4_appsdir}/solid/actions/kscd-play-audiocd.desktop
+%{_kde4_appsdir}/solid/actions/solid_audiocd.desktop
 %{_kde4_docdir}/HTML/en/kscd/
 %{_kde4_iconsdir}/oxygen/*/actions/kscd-dock.*
 %endif
@@ -170,6 +173,9 @@ fi
 
 
 %changelog
+* Mon Nov 23 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
+- Update to 4.3.75 snapshot
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	31 Oct 2009 23:12:22 -0000	1.72
+++ sources	24 Nov 2009 16:55:29 -0000	1.73
@@ -1 +1 @@
-854ddc7057cac4b8bf8d7aa4b7f57516  kdemultimedia-4.3.3.tar.bz2
+52475151d5112d418b070de571da78c3  kdemultimedia-4.3.75svn1048496.tar.bz2


--- kdemultimedia-4.2.85-nomplayerthumbs.patch DELETED ---


--- kdemultimedia-4.3.2-kscd_doc.patch DELETED ---