rpms/firefox/F-11 firefox.spec,1.333,1.334

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23776

Modified Files:
	firefox.spec 
Log Message:
Adjust icons cache update according to template


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/firefox.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -p -r1.333 -r1.334
--- firefox.spec	22 Jul 2009 10:32:46 -0000	1.333
+++ firefox.spec	24 Jul 2009 10:42:27 -0000	1.334
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.1-1
+%define xulrunner_version 1.9.1.1
 %define internal_version %{version}
 
 %define official_branding    1
@@ -19,7 +19,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -274,17 +274,17 @@ touch $RPM_BUILD_ROOT/%{mozappdir}/compo
 
 %post
 update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
-update-desktop-database &> /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 || :
+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 &> /dev/null || :
 
 %preun
 # is it a final removal?
@@ -294,6 +294,8 @@ if [ $1 -eq 0 ]; then
   %{__rm} -rf %{mozappdir}/plugins
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -338,6 +340,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Jul 24 2009 Jan Horak <jhorak at redhat.com> - 3.5.1-3
+- Adjust icons cache update according to template
+
 * Wed Jul 22 2009 Jan Horak <jhorak at redhat.com> - 3.5.1-2
 - New icons fixed