rpms/kdebase/devel kdebase.spec,1.370,1.371

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
- optimize scriptlets



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- kdebase.spec	31 Mar 2009 11:22:52 -0000	1.370
+++ kdebase.spec	1 Apr 2009 19:22:26 -0000	1.371
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -253,19 +253,29 @@
 
 %post
 %{!?libs:/sbin/ldconfig}
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %if "%{name}" == "kdebase"
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 %endif
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+%if "%{name}" == "kdebase"
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+%endif
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
 %{!?libs:/sbin/ldconfig}
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
 %if "%{name}" == "kdebase"
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 %endif
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %if 0%{?libs}
 %post libs -p /sbin/ldconfig
@@ -310,6 +320,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
+- optimize scriptlets
+
 * Mon Mar 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2