rpms/kdemultimedia/F-10 kdemultimedia-4.2.85-nomplayerthumbs.patch, NONE, 1.1 .cvsignore, 1.61, 1.62 kdemultimedia.spec, 1.132, 1.133 sources, 1.64, 1.65

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11839/F-10

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Added Files:
	kdemultimedia-4.2.85-nomplayerthumbs.patch 
Log Message:
kde-4.3.0


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

--- NEW FILE kdemultimedia-4.2.85-nomplayerthumbs.patch ---
diff -up kdemultimedia-4.2.85/CMakeLists.txt.nomplayerthumbs kdemultimedia-4.2.85/CMakeLists.txt
--- kdemultimedia-4.2.85/CMakeLists.txt.nomplayerthumbs	2009-05-06 19:04:42.000000000 -0500
+++ kdemultimedia-4.2.85/CMakeLists.txt	2009-05-17 10:23:16.895948032 -0500
@@ -39,7 +39,7 @@ add_subdirectory(cmake)
 macro_optional_add_subdirectory(doc)
 add_subdirectory(libkcddb)
 add_subdirectory(libkcompactdisc)
-add_subdirectory(mplayerthumbs)
+#add_subdirectory(mplayerthumbs)
 
 if (TAGLIB_FOUND)
   macro_optional_add_subdirectory(juk)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	30 May 2009 14:06:26 -0000	1.61
+++ .cvsignore	5 Aug 2009 12:57:43 -0000	1.62
@@ -1 +1,5 @@
-kdemultimedia-4.2.4.tar.bz2
+kdemultimedia-4.2.90.tar.bz2
+kdemultimedia-4.2.95.tar.bz2
+kdemultimedia-4.2.96.tar.bz2
+kdemultimedia-4.2.98.tar.bz2
+kdemultimedia-4.3.0.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/kdemultimedia.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- kdemultimedia.spec	30 May 2009 14:06:26 -0000	1.132
+++ kdemultimedia.spec	5 Aug 2009 12:57:43 -0000	1.133
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.2.4
+Version: 4.3.0
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -8,23 +8,33 @@ 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
-# upstream patches
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch
+
+## upstream patches
+
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
 # FLAC_OGG_LIBRARY:FILEPATH=FLAC_OGG_LIBRARY-NOTFOUND
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: flac-devel
+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.
+# BuildRequires: pulseaudio-libs-devel
 BuildRequires: taglib-devel
+%if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel
+%endif
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4 >= %{version}
@@ -65,6 +75,9 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -n kdemultimedia-%{version}
 
+%patch1 -p1 -b .nomplayerthumbs
+
+
 %build
 
 mkdir -p %{_target_platform}
@@ -120,6 +133,7 @@ fi
 %{_kde4_appsdir}/profiles/
 %{_kde4_appsdir}/kscd/
 %{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
+%{_kde4_appsdir}/solid/actions/kscd-play-audiocd.desktop
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/*
@@ -151,11 +165,32 @@ fi
 
 
 %changelog
-* Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* 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)
+
+* Mon May 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- Disable BR pulseaudio-libs-devel, KMix PA integration does not work yet.
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	30 May 2009 14:06:26 -0000	1.64
+++ sources	5 Aug 2009 12:57:43 -0000	1.65
@@ -1 +1 @@
-c35f9581401a13a7c14255d30066e75d  kdemultimedia-4.2.4.tar.bz2
+75c0c42f22f5ffc98262441751ccb247  kdemultimedia-4.3.0.tar.bz2