[gnome-applets/f18] Update the icon cache scriptlets

Kalev Lember kalev at fedoraproject.org
Sat Sep 22 12:55:58 UTC 2012


commit f12923d26d170060fabfaf8519da5daf2524cd4d
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sat Sep 22 14:35:31 2012 +0200

    Update the icon cache scriptlets

 gnome-applets.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bbecab7..de1941a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	3.5.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -145,10 +145,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule                                        \
@@ -211,11 +208,14 @@ fi
 
 %postun
 /sbin/ldconfig
-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
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{po_package}.lang
 %doc AUTHORS COPYING NEWS README
 %{_datadir}/pixmaps/*
@@ -257,6 +257,9 @@ fi
 
 
 %changelog
+* Sat Sep 22 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.5.92-2
+- Update the icon cache scriptlets
+
 * Thu Sep 20 2012 Richard Hughes <hughsient at gmail.com> - 1:3.5.92-1
 - Update to 3.5.92
 


More information about the scm-commits mailing list