[libreoffice/f15/master] Update icon cache scriptlet

Christopher Aillon caillon at fedoraproject.org
Sun May 8 03:02:00 UTC 2011


commit 0219acee670036b3ad4a3a28a5249a68a06840ee
Author: Christopher Aillon <caillon at redhat.com>
Date:   Sat May 7 20:01:58 2011 -0700

    Update icon cache scriptlet
    
    http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Icon_Cache

 libreoffice.spec |   38 ++++++++++++++++++--------------------
 1 files changed, 18 insertions(+), 20 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 0e0caab..53785e1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -29,7 +29,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.3.2.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -1787,31 +1787,26 @@ rm -rf $RPM_BUILD_ROOT
 %post core
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database %{_datadir}/applications &> /dev/null || :
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  for theme in hicolor locolor; do
-    if test -d "%{_datadir}/icons/$theme"; then
-      if test -f "%{_datadir}/icons/$theme/index.theme"; then
-        touch --no-create %{_datadir}/icons/$theme
-        gtk-update-icon-cache -q %{_datadir}/icons/$theme
-      fi
-    fi
-  done
-fi
+for theme in hicolor locolor; do
+    touch --no-create %{_datadir}/icons/$theme &>/dev/null || :
+done
 
 %postun core
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database %{_datadir}/applications &> /dev/null || :
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  for theme in hicolor locolor; do
-    if test -d "%{_datadir}/icons/$theme"; then
-      if test -f "%{_datadir}/icons/$theme/index.theme"; then
-        touch --no-create %{_datadir}/icons/$theme
-        gtk-update-icon-cache -q %{_datadir}/icons/$theme
-      fi
-    fi
-  done
+if [ $1 -eq 0 ] ; then
+    for theme in hicolor locolor; do
+        touch --no-create %{_datadir}/icons/$theme &>/dev/null || :
+        gtk-update-icon-cache -q %{_datadir}/icons/$theme &>/dev/null || :
+    done
 fi
 
+%posttrans core
+for theme in hicolor locolor; do
+    gtk-update-icon-cache -q %{_datadir}/icons/$theme &>/dev/null || :
+done
+
+
 %files base
 %defattr(-,root,root,-)
 %dir %{basisinstdir}
@@ -2140,6 +2135,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Sat May 07 2011 Christopher Aillon <caillon at redhat.com> - 1:3.3.2.2-8
+- Update icon cache scriptlet
+
 * Wed May 04 2011 Caolán McNamara <caolanm at redhat.com> 3.3.2.2-7
 - Resolves: rhbz#695509 crash in RefreshDocumentLB
 - Resolves: rhbz#658304 recovery of CSV file causes crash (dtardon)


More information about the scm-commits mailing list