[marble] optimize mimeinfo scriptlet, move mime bits to -common
Rex Dieter
rdieter at fedoraproject.org
Thu Jul 3 19:22:44 UTC 2014
commit 86dfac59f71832c2ce6df6d03137aaec2e4cd682
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Thu Jul 3 14:22:55 2014 -0500
optimize mimeinfo scriptlet, move mime bits to -common
marble.spec | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/marble.spec b/marble.spec
index a3e87b5..6fa3702 100644
--- a/marble.spec
+++ b/marble.spec
@@ -8,7 +8,7 @@ Name: marble
Summary: Virtual globe and world atlas
Epoch: 1
Version: 4.13.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
#URL: https://projects.kde.org/projects/kde/kdeedu/marble
@@ -171,16 +171,14 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/marble-touc
%endif
-%posttrans
-update-desktop-database -q &> /dev/null ||:
-update-mime-database %{_kde4_datadir}/mime >& /dev/null
-
%postun
if [ $1 -eq 0 ] ; then
update-desktop-database -q &> /dev/null ||:
-update-mime-database %{_kde4_datadir}/mime >& /dev/null
fi
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+
%files -f %{name}.lang
%{_kde4_bindir}/marble
%{_kde4_datadir}/applications/kde4/marble.desktop
@@ -205,18 +203,21 @@ fi
%{_kde4_libdir}/kde4/plasma_runner_marble.so
%{_kde4_datadir}/kde4/services/plasma-runner-marble.desktop
%{_qt4_importdir}/org/
-%{_kde4_datadir}/mime/packages/geo.xml
%post common
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_datadir}/mime ||:
%posttrans common
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || :
%postun common
if [ $1 -eq 0 ] ; then
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_datadir}/mime ||:
+update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || :
fi
%files common
@@ -224,6 +225,7 @@ fi
%doc CREDITS MANIFESTO.txt TODO USECASES
%{_kde4_appsdir}/marble/
%{_kde4_iconsdir}/hicolor/*/*/marble.*
+%{_kde4_datadir}/mime/packages/geo.xml
%files mobile
%{_kde4_bindir}/marble-mobile
@@ -267,6 +269,9 @@ fi
%changelog
+* Thu Jul 03 2014 Rex Dieter <rdieter at fedoraproject.org> 1:4.13.2-3
+- optimize mimeinfo scriptlet, move mime bits to -common
+
* Thu Jun 26 2014 Rex Dieter <rdieter at fedoraproject.org> 1:4.13.2-2
- BR: qtwebkit ...
More information about the scm-commits
mailing list