rpms/file-roller/devel file-roller.spec,1.166,1.167

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18879

Modified Files:
	file-roller.spec 
Log Message:
some scriptlet cleanup



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- file-roller.spec	22 Dec 2009 17:48:51 -0000	1.166
+++ file-roller.spec	22 Dec 2009 17:52:36 -0000	1.167
@@ -32,13 +32,9 @@ BuildRequires: GConf2-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: intltool
 
-Requires(post): scrollkeeper
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
-
-Requires(postun): scrollkeeper
-
 Requires: GConf2
 
 # The context menu API changed in 2.2.0:
@@ -87,10 +83,7 @@ update-desktop-database &> /dev/null || 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/dev/null || :
-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 || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -108,11 +101,14 @@ fi
 
 %postun
 update-desktop-database &> /dev/null || :
-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 -q %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc README COPYING NEWS AUTHORS