rpms/kdesdk/devel kdesdk.spec,1.140,1.141

Rex Dieter rdieter at fedoraproject.org
Wed Apr 1 19:12:20 UTC 2009


Author: rdieter

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

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



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- kdesdk.spec	31 Mar 2009 15:36:55 -0000	1.140
+++ kdesdk.spec	1 Apr 2009 19:11:49 -0000	1.141
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -29,8 +29,6 @@
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -121,15 +119,29 @@
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/locolor &> /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}/locolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -214,6 +226,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
 * Tue Mar 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 




More information about the scm-commits mailing list