[system-config-keyboard] update gtk-update-icon-cache scriptlets

Nils Philippsen nphilipp at fedoraproject.org
Tue Jul 9 14:00:42 UTC 2013


commit f5f4129dba9c2e77a1e8dcef562ce7bedb4c767b
Author: Nils Philippsen <nils at redhat.com>
Date:   Tue Jul 9 15:50:23 2013 +0200

    update gtk-update-icon-cache scriptlets

 system-config-keyboard.spec |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/system-config-keyboard.spec b/system-config-keyboard.spec
index 7c272e8..d53833a 100644
--- a/system-config-keyboard.spec
+++ b/system-config-keyboard.spec
@@ -60,19 +60,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root)
 %{_sbindir}/system-config-keyboard
@@ -97,6 +98,7 @@ fi
 - version 1.4.0
 - remove ancient obsoletes and bogus requirements
 - require systemd >= 30 for localed
+- update gtk-update-icon-cache scriptlets
 
 * Thu Jun 06 2013 Adam Williamson <awilliam at redhat.com> - 1.3.1-14
 - localed_config.patch: work with localed (from vpodzime)


More information about the scm-commits mailing list