rpms/amarok/devel amarok.spec,1.143,1.144

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30757

Modified Files:
	amarok.spec 
Log Message:
* Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-5
- enable external qtscriptgenerator/qtscriptbindings
- optimize scriptlets



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- amarok.spec	10 Mar 2009 19:27:41 -0000	1.143
+++ amarok.spec	7 Apr 2009 19:07:34 -0000	1.144
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -16,7 +16,7 @@
 Patch1:  amarok-2.0.1.1-gcc44.patch
 
 # qtscriptgenerator review, http://bugzilla.redhat.com/489550
-#define no_qtscriptgenerator 1
+%define no_qtscriptgenerator 1
 Patch2:  amarok-2.0.2-no_qtscriptgenerator.patch
 
 Patch100: amarok-2.0.1.1-qt45.patch
@@ -48,9 +48,6 @@
 Requires: qtscriptgenerator
 %endif
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
 Obsoletes: amarok-visualisation < 1.5
@@ -72,9 +69,9 @@
 
 %patch1 -p1 -b .gcc4
 
-%if 0%{?no_qscriptgenerator}
+%if 0%{?no_qtscriptgenerator}
 %patch2 -p1 -b .no_qtscriptgenerator
-#rm -rf src/scriptengine/generator
+rm -rf src/scriptengine/generator
 %else
 %{?_qt45:%patch100 -p0 -b .qt45}
 %endif
@@ -117,13 +114,19 @@
 
 %post
 /sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %files -f amarok.lang
@@ -151,6 +154,10 @@
 
 
 %changelog
+* Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-5
+- enable external qtscriptgenerator/qtscriptbindings
+- optimize scriptlets
+
 * Tue Mar 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-4
 - Req: qtscriptgenerator (f11+) (not enabled, pending review)
 - use desktop-file-validate