From 7cb9eaf4c6f553734026bb0862e40ac85e0cf92b Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@redhat.com>
Date: Sat, 7 May 2011 18:44:12 -0700
Subject: [PATCH] Update scriptlets per packaging guidelines

http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#desktop-database
http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Icon_Cache
---
 gimp.spec | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/gimp.spec b/gimp.spec
index c8e612a..64cc924 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -38,7 +38,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.6.11
-Release:        11%{?dist}
+Release:        12%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -359,21 +359,19 @@ ln -snf gimprc-%{binver}.5 %{buildroot}/%{_mandir}/man5/gimprc.5
 rm -rf %{buildroot}
 
 %post
-/usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null || :
-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 &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-if [ "$1" = "0" ]; then
-    /usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null || :
-fi
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database &> /dev/null || :
+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 || :
+
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
@@ -505,6 +503,9 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Sat May 07 2011 Christopher Aillon <caillon@redhat.com> - 2:2.6.11-12
+- Update desktop database, icon cache scriptlets
+
 * Fri May 06 2011 Nils Philippsen <nils@redhat.com> - 2:2.6.11-11
 - simplify poppler-0.17 patch to avoid adding to libgimp (#698157)