rpms/kipi-plugins/F-11 kipi-plugins.spec,1.93,1.94

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16258

Modified Files:
	kipi-plugins.spec 
Log Message:
* Fri May 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-2
- optimize scriptlets



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-11/kipi-plugins.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- kipi-plugins.spec	12 May 2009 10:49:26 -0000	1.93
+++ kipi-plugins.spec	23 May 2009 04:52:44 -0000	1.94
@@ -3,7 +3,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -43,8 +43,8 @@ BuildRequires: expat-devel
 ## RemoveRedeye
 BuildRequires: opencv-devel
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 ## jpeglossless plugin
 Requires: ImageMagick
@@ -117,16 +117,24 @@ rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null  ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen  &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor >& /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor >& /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 
 
 %files -f %{name}-all.lang
@@ -174,6 +182,9 @@ xdg-desktop-menu forceupdate 2> /dev/nul
 
 
 %changelog
+* Fri May 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-2
+- optimize scriptlets
+
 * Tue May 12 2009 Lukáš Tinkl <ltinkl at redhat.com> - 0.3.0-1
 - latest upstream bugfix release 0.3.0, many fixes 
   (cf http://www.digikam.org/drupal/node/449)