rpms/kdemultimedia/devel .cvsignore, 1.44, 1.45 kdemultimedia.spec, 1.106, 1.107 sources, 1.46, 1.47 kdemultimedia-4.0.3-kmix-systray.patch, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7095/devel

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Removed Files:
	kdemultimedia-4.0.3-kmix-systray.patch 
Log Message:
* Sat May 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
- update to 4.0.72
- drop backported kmix-systray patch
- Obsoletes/Provides dragonplayer, add it to description and file list
- add BR xine-lib-devel for dragonplayer


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	28 Mar 2008 17:17:01 -0000	1.44
+++ .cvsignore	10 May 2008 01:37:27 -0000	1.45
@@ -1,4 +1 @@
-kdemultimedia-4.0.0.tar.bz2
-kdemultimedia-4.0.1.tar.bz2
-kdemultimedia-4.0.2.tar.bz2
-kdemultimedia-4.0.3.tar.bz2
+kdemultimedia-4.0.72.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- kdemultimedia.spec	3 Apr 2008 17:41:41 -0000	1.106
+++ kdemultimedia.spec	10 May 2008 01:37:27 -0000	1.107
@@ -1,15 +1,14 @@
 
 Name: kdemultimedia
 Epoch: 6
-Version: 4.0.3
-Release: 3%{?dist}
+Version: 4.0.72
+Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
 License:   GPLv2
 URL:       http://www.kde.org/
 Source0:   ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
-Patch0:    kdemultimedia-4.0.3-kmix-systray.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
@@ -29,6 +28,7 @@
 BuildRequires: libvorbis-devel
 BuildRequires: pcre-devel
 BuildRequires: taglib-devel
+BuildRequires: xine-lib-devel
 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
@@ -37,11 +37,14 @@
 Requires: kdelibs4 >= %{version}
 Requires: kdebase-workspace >= %{version}
 
+Provides:      dragonplayer = 2.0.2-0.1
+Obsoletes:     dragonplayer < 2.0.2-0.1
+
 Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
 
-# FIXME/TODO: Taken from 3.5.8. review needed
 %description
 The %{name} package contains multimedia applications, including:
+* dragonplayer (a simple video player)
 * juk (a music manager and player)
 * kmix (an audio mixer)
 * kscd (an Audio-CD player)
@@ -50,6 +53,11 @@
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release} 
+
+# force replacing old standalone dragonplayer with the main package
+# otherwise, dragonplayer conflicts with this over dragonpart.so
+Conflicts: dragonplayer < 2.0.2-0.1
+
 %description libs
 %{summary}.
 
@@ -64,7 +72,6 @@
 
 %prep
 %setup -q -n kdemultimedia-%{version}
-%patch0 -p1 -b .kmix-systray
 
 %build
 
@@ -88,9 +95,11 @@
 
 %post
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %postun
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -101,19 +110,23 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_bindir}/*
+%{_kde4_appsdir}/dragonplayer/
 %{_kde4_appsdir}/juk/
 %{_kde4_appsdir}/kmix/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/profiles/*
+%{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
+%{_kde4_docdir}/HTML/en/dragonplayer/
 %{_kde4_docdir}/HTML/en/juk/
 %{_kde4_docdir}/HTML/en/kmix/
 %{_kde4_docdir}/HTML/en/kscd/
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/actions/player-volume-muted.*
 %{_kde4_libdir}/libkdeinit*.so
 
 %files libs
@@ -131,6 +144,12 @@
 
 
 %changelog
+* Sat May 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
+- update to 4.0.72
+- drop backported kmix-systray patch
+- Obsoletes/Provides dragonplayer, add it to description and file list
+- add BR xine-lib-devel for dragonplayer
+
 * Thu Apr 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-3
 - rebuild (again) for the fixed %%{_kde4_buildtype}
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	28 Mar 2008 17:17:01 -0000	1.46
+++ sources	10 May 2008 01:37:27 -0000	1.47
@@ -1 +1 @@
-e14bc666dac01573f59da81055d78e31  kdemultimedia-4.0.3.tar.bz2
+eeda45f7eaa365f1b4f1e7791f410130  kdemultimedia-4.0.72.tar.bz2


--- kdemultimedia-4.0.3-kmix-systray.patch DELETED ---