[glom] Modernize rpm scriptlets
Kalev Lember
kalev at fedoraproject.org
Sat May 17 16:15:09 UTC 2014
commit d57d6d18bbafca06d2c7a81e6788b121c80cb450
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sat May 17 18:01:06 2014 +0200
Modernize rpm scriptlets
https://fedoraproject.org/wiki/Packaging:ScriptletSnippets
glom.spec | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/glom.spec b/glom.spec
index 493832b..fa27e1c 100644
--- a/glom.spec
+++ b/glom.spec
@@ -101,27 +101,26 @@ desktop-file-install --vendor "" --delete-original \
%post
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-
-%post libs -p /sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+update-mime-database %{_datadir}/mime &>/dev/null || :
%postun
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+update-mime-database %{_datadir}/mime &>/dev/null || :
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%post libs -p /sbin/ldconfig
+
%postun libs -p /sbin/ldconfig
@@ -159,6 +158,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
* Sat May 17 2014 Kalev Lember <kalevlember at gmail.com> - 1.26.0-1
- Update to 1.26.0
- Drop obsolete scrollkeeper handling
+- Modernize rpm scriptlets
* Mon Nov 4 2013 Haïkel Guémar <hguemar at fedoraproject.org> - 1.24.2-1
- upstream 1.24.2
More information about the scm-commits
mailing list