[kdelibs] optimize mimeinfo scriptlet

Rex Dieter rdieter at fedoraproject.org
Thu Jul 3 17:25:50 UTC 2014


commit a571b3ef12b5c159383daf2f674f67e7e6640f3a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Jul 3 12:26:00 2014 -0500

    optimize mimeinfo scriptlet

 kdelibs.spec |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 225ac66..c5d0836 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -39,7 +39,7 @@
 
 Summary: KDE Libraries
 Version: 4.13.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -515,20 +515,22 @@ time xvfb-run -a dbus-launch --exit-with-session make -C %{_target_platform}/ te
 %post
 /sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/mime/packages ||:
 
 %postun
 /sbin/ldconfig ||:
 if [ $1 -eq 0 ] ; then
-    update-desktop-database -q &> /dev/null
-    update-mime-database %{_datadir}/mime >& /dev/null
-    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
-    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/mime/packages ||:
+  update-mime-database -n %{_datadir}/mime >& /dev/null || update-mime-database %{_datadir}/mime >& /dev/null ||:
 fi
 
 %posttrans
-update-desktop-database -q &> /dev/null
-update-mime-database %{_datadir}/mime >& /dev/null
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+update-mime-database -n %{_datadir}/mime >& /dev/null || update-mime-database %{_datadir}/mime >& /dev/null ||:
 
 %files
 %doc AUTHORS README TODO
@@ -725,6 +727,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
+* Thu Jul 03 2014 Rex Dieter <rdieter at fedoraproject.org> 6:4.13.2-9
+- optimize mimeinfo scriptlet
+
 * Fri Jun 20 2014 Rex Dieter <rdieter at fedoraproject.org> - 6:4.13.2-8
 - %%files enumerate libs
 - move kdewebkitwidgets.so to -webkit too


More information about the scm-commits mailing list