rpms/phonon/F-10 phonon.spec,1.18,1.19

[Rex Dieter]

Author: rdieter

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

Modified Files:
	phonon.spec 
Log Message:
* Wed May 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-6
- phonon-backend-gstreamer multilib conflict (#501816)



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/phonon.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- phonon.spec	4 May 2009 16:25:31 -0000	1.18
+++ phonon.spec	20 May 2009 21:08:12 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 4%{?dist}
+Release: 6%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -30,7 +30,7 @@ BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
-BuildRequires: ImageMagick
+BuildRequires: GraphicsMagick
 BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
@@ -104,7 +104,8 @@ mv %{buildroot}%{_datadir}/icons/oxygen 
 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/phonon-gstreamer.png
+  gm convert -background None -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
+  touch --reference %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
 done
 
 
@@ -172,6 +173,13 @@ fi
 
 
 %changelog
+* Wed May 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-6
+- phonon-backend-gstreamer multilib conflict (#501816)
+
+* Wed May 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
+- s/ImageMagick/GraphicsMagick/, avail on more secondary archs, is faster,
+  yields better results.
+
 * Mon May 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
 - fix Source0 Url
 - xine backend will not play files with non-ascii names (kdebug#172242)