From 4aa7181e3e222e7df4f3eec86e1a8b4012a1fccc Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 9 Jan 2009 01:31:53 +0000
Subject: [PATCH] - new tarball - put icons/scriptlets into main pkg -
 Requires: phonon-backend

---
 phonon.spec | 43 ++++++++++++++++++++++---------------------
 sources     |  2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/phonon.spec b/phonon.spec
index 8f158db..133bbaf 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -1,12 +1,12 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.2.96
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/4.1.80/src/phonon-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/4.1.96/src/phonon-%{version}.tar.bz2
 Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 # Make PulseAudio the default again when listed by the backend.
 # Note that this currently only works for the Xine backend. Device selection in
@@ -30,9 +30,12 @@ BuildRequires: pkgconfig
 BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
-## hard-code phonon-backend-xine, for now, so yum doesn't choose -gstreamer by default
-Requires: phonon-backend-xine
-#Requires: phonon-backend
+Requires: phonon-backend
+## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
+#Requires(hint): phonon-backend-xine
+
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
 
 %description
 %{summary}.
@@ -44,8 +47,6 @@ Requires: %{name} = %{version}-%{release}
 Provides: phonon-backend = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
 Provides:  %{name}-backend-gst = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description backend-gstreamer
 %{summary}.
 
@@ -54,8 +55,6 @@ Summary: xine phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Provides: phonon-backend = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description backend-xine
 %{summary}.
 
@@ -96,25 +95,27 @@ for i in 16 22 32 48 64 128; do
 done
 
 
-
 %clean
 rm -rf %{buildroot}
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n %{name}-backend-gstreamer
+%post
+/sbin/ldconfig
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
-%postun -n %{name}-backend-gstreamer
+%postun
+/sbin/ldconfig
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || 
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
-%{_libdir}/libphonon*.so.*
+%{_libdir}/libphonon*.so.4*
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/oxygen/*/*/*
 # kde4-specific dirs
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
@@ -123,16 +124,11 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
 %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
-%_datadir/icons/hicolor/*/*/*.png
-%_datadir/icons/hicolor/*/*/*.svg
 
 %files backend-xine
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
 %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
-%_datadir/icons/hicolor/*/*/*.png
-%_datadir/icons/hicolor/*/*/*.svg
-%_datadir/icons/oxygen/*/*/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -144,6 +140,11 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %changelog
+* Thu Jan 08 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.96-3
+- new tarball
+- put icons/scriptlets into main pkg
+- Requires: phonon-backend
+
 * Thu Jan 08 2009 Lorenzo Villani <lvillani@binaryhelix.net> - 4.2.96-2
 - add gstreaer-logo.svg
 
diff --git a/sources b/sources
index 8f08d93..513b763 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c971f70b6e00f573a7664f6849c3e17  phonon-4.2.96.tar.bz2
+35b64db6e850df7d492f812a85b16982  phonon-4.2.96.tar.bz2