- Requires: phonon-backend >= %version

- move icons to hicolor theme and into -backend subpkgs
- BR: libxcb-devel
- move phonon-gstreamer.svg to sources

.cvsignore

@@ -1,2 +1,2 @@
-phonon-4.2.96.tar.bz2
+gstreamer-logo.svg
 phonon-4.3.0.tar.bz2

gstreamer-logo.svg

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="280.22" height="69.387"
-	 viewBox="0 0 280.22 69.387" overflow="visible" enable-background="new 0 0 280.22 69.387" xml:space="preserve">
-<path fill="#8C8C8C" d="M199.551,58.684c-0.334-6.834,2.636-22.747,9.47-21.247c2.913,0.64,2.118,4.655,1.166,9
-	c-1.282,5.85-3.5,12.237-3.5,12.237s8.334,0.333,8.167,0c0.833-10.5,3.039-21.928,9.167-21.071
-	c5.081,0.71-1.441,21.071-1.441,21.071s6.27,0,7.587,0c-0.272-3.453,1.59-11.495,2.635-17.311s-1.181-8.36-5.86-8.405
-	s-9.314,4.044-9.314,4.044c0.182-3.498-4.429-4.05-4.429-4.05c-4.93-0.313-9.655,3.005-9.655,3.005l0.438-2.57h-7.425
-	c0,0-0.365,4.088-1.867,11.549s-3.51,13.738-3.51,13.738L199.551,58.684z"/>
-<path fill="#8C8C8C" d="M250.388,32.759c-10.167,0-14.7,7.178-14.7,14.511s4.332,12.167,13.166,12.167c4.15,0,6.5-3.834,6.5-3.834
-	s0.134-1.049-0.65-0.612s-2.92,1.352-5.71,1.352s-5.806-2.654-5.806-9.239c0,0,16.166,0,16,0
-	C260.021,44.437,260.555,32.759,250.388,32.759z M251.871,44.136h-7.76c0-5.362,4.29-9.412,7.211-7.974
-	C253.982,37.397,251.871,44.136,251.871,44.136z"/>
-<path fill="#8C8C8C" d="M154.888,32.759c-10.167,0-14.7,7.178-14.7,14.511s4.332,12.167,13.166,12.167c4.15,0,6.5-3.834,6.5-3.834
-	s0.134-1.049-0.65-0.612s-2.92,1.352-5.71,1.352s-5.806-2.654-5.806-9.239c0,0,16.166,0,16,0
-	C164.521,44.437,165.055,32.759,154.888,32.759z M156.371,44.136h-7.76c0-5.362,3.621-8.836,6.542-7.397
-	C157.813,37.973,156.371,44.136,156.371,44.136z"/>
-<path fill="#8C8C8C" d="M268.725,59.088h-8.198c0,0,4.786-17.192,5.203-25.621c-0.072,0.072,7.11,0,7.11,0s-0.617,1.9-0.885,3.559
-	c2.031-2.249,2.719-4.272,8.232-4.272c0.072,0,0,7.109,0,7.109s-5.15-1.275-7,0.574S269.354,43.77,268.725,59.088z"/>
-<path fill="#8C8C8C" d="M127.225,59.088h-8.198c0,0,4.786-17.192,5.203-25.621c-0.072,0.072,7.11,0,7.11,0s-0.617,1.9-0.885,3.559
-	c2.031-2.249,2.719-4.272,8.232-4.272c0.072,0,0,7.109,0,7.109s-5.15-1.275-7,0.574S127.854,43.77,127.225,59.088z"/>
-<path fill="#8C8C8C" d="M117.227,24.633l-6.705,2.325l-1.541,6.244h-4.273v4.105h3.374c0,0-3.598,12.875-2.924,16.812
-	c0.675,4.273,4.836,5.172,7.31,5.06s3.149-1.911,3.036-2.586s-3.487,0.644-3.824-2.393c-0.225-1.799,2.812-16.893,2.812-16.893
-	h5.285v-4.105h-4.161L117.227,24.633z"/>
-<path fill="#8C8C8C" d="M187.104,58.691c0.994-0.821,0.33-2.463-0.53-2.661c-0.97-2.011,2.023-13.763,2.023-16.98
-	s-5.397-9.671-16.53-3.599c-1.079,0.686-0.682,1.808-0.416,2.183s0.766,0.625,1,0.375c1.047-1.141,5.602-2.333,7.737-0.084
-	c1.462,1.35,1.396,3.958,0.383,4.97c-1.236,0.112-13.427-0.246-14.889,7.513c-2.522,13.777,12.92,6.522,13.719,5.96
-	s0.706,1.626,2.003,2.548C185.125,59.223,186.41,59.264,187.104,58.691z M179.396,52.935c-1.25,3.292-5.891,2.789-6.166,0.459
-	c-1-7.792,7.041-7.209,7.041-7.209S180.646,49.643,179.396,52.935z"/>
-<path fill="#8C8C8C" d="M98.272,40.792l2.332-3.939c0,0-1.9-4.045-7.511-4.045s-8.848,4.046-8.848,8.848s10.682,8.417,8.093,13.164
-	c-4.316,4.424-8.872-2.792-8.782-3.266c-0.326,0.47-2.56,3.549-2.452,3.549c0.54,1.079,2.5,4.5,8.752,4.572
-	c5.179,0.06,8.309-3.776,8.417-8.523c0.108-6.366-9.172-9.604-9.28-12.517S95.144,32.375,98.272,40.792z"/>
-<path d="M86.042,31.416c-1-0.938-1.75,0.313-4,1.25s-3,0.813-5.25,0.5c-3.688-0.813-10.17-0.57-11.875,0.25
-	c-11.386,4.572-5.281,13.031-3.422,14.719c-0.016,0-2.773,1.453-3.176,3.735c-0.518,2.933,0.831,4.52,0.873,4.561
-	c-3.72,0.193-6.112,3.934-5.536,6.997c0.62,3.299,4.553,5.931,10.184,5.953c11.904,0.259,12.521-7.353,12.521-7.353
-	c1.629-9.258-6.222-9.685-11.817-9.25c-2.025-1.809-0.445-3.496-0.531-3.496C82.917,49.728,78.158,37.12,78.158,37.12
-	C81.35,36.343,87.604,32.916,86.042,31.416z M60.722,57.939c7.405,1.336,10.385-0.362,10.892,3.413
-	c0.219,3.684-2.908,4.737-6.545,4.963s-6.287-1.612-6.433-3.975C58.491,59.977,60.555,60.221,60.722,57.939z M72.161,41.835
-	c-0.684,3.028-2.782,5.136-4.687,4.706c-1.905-0.431-2.894-3.234-2.211-6.263c0.684-3.029,2.782-5.137,4.687-4.707
-	C71.855,36.002,72.845,38.806,72.161,41.835z"/>
-<path fill="#FF3131" d="M47.141,5.199c-5.409,0-13.323-4.407-21.036-4.407S13.785,5.199,12.983,5.8
-	c-0.801,0.601-1.303,2.904,1.102,2.203s4.407-0.701,8.214-0.701s12.922,5.209,22.138,5.209S61.365,5.4,63.068,2.895
-	s0.1-3.306-1.202-2.704C60.563,0.792,52.15,5.199,47.141,5.199z"/>
-<path fill="#319831" d="M70.639,18.921c-5.683,0-13.997-4.406-22.1-4.406s-12.944,4.406-13.786,5.008s-1.369,2.904,1.157,2.203
-	s4.63-0.701,8.629-0.701c3.999,0,13.576,5.209,23.257,5.209s17.785-7.111,19.574-9.615c1.789-2.505,0.105-3.307-1.263-2.705
-	S75.901,18.921,70.639,18.921z"/>
-<path fill="#3232CC" d="M37.936,34.063c-5.893,0-14.515-4.761-22.918-4.761c-8.403,0-13.424,4.761-14.297,5.41
-	s-1.419,3.137,1.2,2.379c2.62-0.757,4.802-0.757,8.949-0.757S24.949,41.96,34.99,41.96c10.04,0,18.443-7.681,20.299-10.386
-	s0.109-3.57-1.31-2.921C52.56,29.302,43.393,34.063,37.936,34.063z"/>
-</svg>

phonon.spec

@@ -1,8 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
-
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -25,17 +24,15 @@ BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: ImageMagick
 BuildRequires: kde-filesystem
+BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
-Requires: phonon-backend
+Requires: phonon-backend >= %{version}
 ## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
-#Requires(hint): phonon-backend-xine
+#Requires(hint): phonon-backend-xine >= %{version}
-
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
 
 %description
 %{summary}.
@@ -44,6 +41,8 @@ Requires(postun): /sbin/ldconfig xdg-utils
 Summary: Gstreamer phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Provides: phonon-backend = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
 Provides:  %{name}-backend-gst = %{version}-%{release}
@@ -54,6 +53,8 @@ Provides:  %{name}-backend-gst = %{version}-%{release}
 Summary: xine phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Provides: phonon-backend = %{version}-%{release}
 %description backend-xine
 %{summary}.
@@ -88,10 +89,15 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-gstreamer.svg
+# move the oxygen-only phonon-xine icons to hicolor
+test -d %{buildroot}%{_datadir}/icons/hicolor && exit 0
+mv %{buildroot}%{_datadir}/icons/oxygen \
+   %{buildroot}%{_datadir}/icons/hicolor
+
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
 for i in 16 22 32 48 64 128; do
   mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
-  convert -background None -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}-gstreamer.png
+  convert -background None -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
 done
 
 
@@ -99,23 +105,28 @@ done
 rm -rf %{buildroot}
 
 
-%post
+%post -p /sbin/ldconfig
-/sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post backend-xine
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
-%postun
+%postun backend-xine
-/sbin/ldconfig
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
+%post backend-gstreamer
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun backend-gstreamer
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_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/
@@ -124,11 +135,13 @@ xdg-icon-resource forceupdate --theme oxygen 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/*/apps/phonon-xine.*
 
 %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/*/apps/phonon-gstreamer.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -140,6 +153,12 @@ xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dietger <rdieter@fedoraproject.org> - 4.3.0-4
+- Requires: phonon-backend >= %%version
+- move icons to hicolor theme and into -backend subpkgs
+- BR: libxcb-devel
+- move phonon-gstreamer.svg to sources
+
 * Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-3
 - BR: automoc4 >= 0.9.86
 

sources

@@ -1 +1,2 @@
+8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
 f851219ec1fb4eadc7904f053b6b498d  phonon-4.3.0.tar.bz2