rpms/kdelibs/devel kdelibs.spec,1.456,1.457

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdelibs.spec 
Log Message:
* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-9
- scriptlet optimization



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -r1.456 -r1.457
--- kdelibs.spec	19 Mar 2009 12:17:24 -0000	1.456
+++ kdelibs.spec	23 Mar 2009 16:41:02 -0000	1.457
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -97,8 +97,8 @@
 #Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: qt4 >= %{_qt4_version}
 Requires: xdg-utils
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 BuildRequires: alsa-lib-devel
 %if 0%{?fedora} < 9
@@ -311,14 +311,22 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 %postun
 /sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    update-desktop-database &>/dev/null
+    update-mime-database %{_kde4_datadir}/mime >& /dev/null
+    touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+fi
+
+%posttrans
+update-desktop-database &>/dev/null
+update-mime-database %{_kde4_datadir}/mime >& /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 
 %clean
@@ -340,10 +348,10 @@
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
-%{_kde4_datadir}/mime/packages/*
+%{_kde4_datadir}/mime/packages/kde.xml
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
-%{_kde4_sharedir}/icons/hicolor/*/actions/*
+%{_kde4_iconsdir/hicolor/*/actions/*
 %{_kde4_docdir}/HTML/en/sonnet/
 %{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_libdir}/lib*.so.*
@@ -405,6 +413,9 @@
 
 
 %changelog
+* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-9
+- scriptlet optimization
+
 * Thu Mar 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-8
 - Provides: kdelibs4%%{?_isa} ... (#491082)