[calligra] optimize mimeinfo scriptlet

Rex Dieter rdieter at fedoraproject.org
Thu Jul 3 19:29:28 UTC 2014


commit e61b5fc90934338fa214029ee0042814d60b97ae
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Jul 3 14:29:40 2014 -0500

    optimize mimeinfo scriptlet

 calligra.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/calligra.spec b/calligra.spec
index 5fd35f5..3dd7985 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -26,7 +26,7 @@
 
 Name:    calligra 
 Version: 2.8.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: An integrated office suite
 
 License: GPLv2+ and LGPLv2+
@@ -593,12 +593,13 @@ done
 %post core
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+touch --no-create %{_kde4_datadir}/mime ||:
 
 %posttrans core
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
-update-mime-database %{_datadir}/mime >& /dev/null
+update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || :
 
 %postun core
 if [ $1 -eq 0 ] ; then
@@ -607,7 +608,8 @@ 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 || :
 update-desktop-database -q &> /dev/null ||:
-update-mime-database %{_datadir}/mime >& /dev/null
+touch --no-create %{_kde4_datadir}/mime ||:
+update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || :
 fi
 
 %files core
@@ -1237,6 +1239,9 @@ fi
 
 
 %changelog
+* Thu Jul 03 2014 Rex Dieter <rdieter at fedoraproject.org> 2.8.4-2
+- optimize mimeinfo scriptlet
+
 * Tue Jun 24 2014 Rex Dieter <rdieter at fedoraproject.org> 2.8.4-1
 - 2.8.4
 


More information about the scm-commits mailing list