--- a/ChangeLog	Mon Mar 10 08:28:07 2008 +0000
+++ b/ChangeLog	Tue Mar 11 14:43:19 2008 +0000
@@ -1,3 +1,10 @@
+2008-03-10  Damien Carbery <[email protected]>
+
+	* SUNWgnome-applets.spec: Use common scripts in %post
+	  (scrollkeeper-update.script, icon-cache.script, gconf-install.script).
+	* closed/SUNWacroread.spec: Use icon-cache.script to update icon cache.
+	  Fixes 6631419.
+
 2008-03-10  Damien Carbery <[email protected]>
 
 	==== Nevada build 86 ====

--- a/SUNWgnome-applets.spec	Mon Mar 10 08:28:07 2008 +0000
+++ b/SUNWgnome-applets.spec	Tue Mar 11 14:43:19 2008 +0000
@@ -243,94 +243,43 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post -n SUNWgnome-fun-applets
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/gtk-update-icon-cache || exit 0';
-  echo 'rm -f %{_datadir}/icons/*/icon-theme.cache';
-  echo 'ls -d %{_datadir}/icons/* | xargs -l1 /usr/bin/gtk-update-icon-cache'
-) | $BASEDIR/lib/postrun -b -u -t 5 -c JDS
+%include scrollkeeper-update.script
+%include icon-cache.script
 
 %postun -n SUNWgnome-fun-applets
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/gtk-update-icon-cache || exit 0';
-  echo 'rm -f %{_datadir}/icons/*/icon-theme.cache';
-  echo 'ls -d %{_datadir}/icons/* | xargs -l1 /usr/bin/gtk-update-icon-cache'
-) | $BASEDIR/lib/postrun -b -u -t 5 -c JDS
+%include scrollkeeper-update.script
+%include icon-cache.script
 
 %post -n SUNWgnome-internet-applets
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%include scrollkeeper-update.script
 
 %postun -n SUNWgnome-internet-applets
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%include scrollkeeper-update.script
 
 %post -n SUNWgnome-intranet-applets
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/gtk-update-icon-cache || exit 0';
-  echo 'rm -f %{_datadir}/icons/*/icon-theme.cache';
-  echo 'ls -d %{_datadir}/icons/* | xargs -l1 /usr/bin/gtk-update-icon-cache'
-) | $BASEDIR/lib/postrun -b -u -t 5 -c JDS
+%include scrollkeeper-update.script
+%include icon-cache.script
 
 %postun -n SUNWgnome-intranet-applets
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/gtk-update-icon-cache || exit 0';
-  echo 'rm -f %{_datadir}/icons/*/icon-theme.cache';
-  echo 'ls -d %{_datadir}/icons/* | xargs -l1 /usr/bin/gtk-update-icon-cache'
-) | $BASEDIR/lib/postrun -b -u -t 5 -c JDS
+%include scrollkeeper-update.script
+%include icon-cache.script
 
 %post -n SUNWgnome-mm-applets
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%include scrollkeeper-update.script
 
 %postun -n SUNWgnome-mm-applets
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%include scrollkeeper-update.script
 
 %post -n SUNWgnome-utility-applets
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/gtk-update-icon-cache || exit 0';
-  echo 'rm -f %{_datadir}/icons/*/icon-theme.cache';
-  echo 'ls -d %{_datadir}/icons/* | xargs -l1 /usr/bin/gtk-update-icon-cache'
-) | $BASEDIR/lib/postrun -b -u -t 5 -c JDS
+%include scrollkeeper-update.script
+%include icon-cache.script
 
 %postun -n SUNWgnome-utility-applets
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/gtk-update-icon-cache || exit 0';
-  echo 'rm -f %{_datadir}/icons/*/icon-theme.cache';
-  echo 'ls -d %{_datadir}/icons/* | xargs -l1 /usr/bin/gtk-update-icon-cache'
-) | $BASEDIR/lib/postrun -b -u -t 5 -c JDS
+%include scrollkeeper-update.script
+%include icon-cache.script
 
 %post -n SUNWgnome-fun-applets-root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
-  echo '  exit 1';
-  echo '}';
-  echo 'umask 0022';
-  echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
-  echo 'export GCONF_CONFIG_SOURCE';
-  echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas'
-) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
+%include gconf-install.script
 
 %preun -n SUNWgnome-fun-applets-root
 test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -349,15 +298,7 @@
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-internet-applets-root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
-  echo '  exit 1';
-  echo '}';
-  echo 'umask 0022';
-  echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
-  echo 'export GCONF_CONFIG_SOURCE';
-  echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas'
-) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
+%include gconf-install.script
 
 %preun -n SUNWgnome-internet-applets-root
 test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -376,15 +317,7 @@
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-intranet-applets-root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
-  echo '  exit 1';
-  echo '}';
-  echo 'umask 0022';
-  echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
-  echo 'export GCONF_CONFIG_SOURCE';
-  echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas'
-) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
+%include gconf-install.script
 
 %preun -n SUNWgnome-intranet-applets-root
 test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -403,15 +336,7 @@
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-mm-applets-root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
-  echo '  exit 0';
-  echo '}';
-  echo 'umask 0022';
-  echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
-  echo 'export GCONF_CONFIG_SOURCE';
-  echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas'
-) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
+%include gconf-install.script
 
 %preun -n SUNWgnome-mm-applets-root
 test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -430,6 +355,7 @@
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-utility-applets-root
+%include gconf-install.script
 ( echo 'test -x /usr/bin/gconftool-2 || {';
   echo '  echo "ERROR: gconftool-2 not found"';
   echo '  exit 1';
@@ -731,6 +657,9 @@
 # %{_datadir}/omf/gnome-netstatus/*-[a-z][a-z]_*.omf
 
 %changelog
+* Tue Mar 11 2008 - [email protected]
+- Use common scripts in %post (scrollkeeper-update.script, icon-cache.script,
+  gconf-install.script).
 * Thu Oct 11 2007 - [email protected]
 - Fix packaging so that invest applet's python code gets installed.
   Fixes bug #6502277.

--- a/closed/SUNWacroread.spec	Mon Mar 10 08:28:07 2008 +0000
+++ b/closed/SUNWacroread.spec	Tue Mar 11 14:43:19 2008 +0000
@@ -37,6 +37,7 @@
 Requires: SUNWlibmsr
 Requires: SUNWlibms
 Requires: SUNWgnome-base-libs
+Requires: SUNWpostrun
 BuildRequires: SUNWgnome-base-libs-devel
 
 %ifarch sparc
@@ -71,10 +72,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-( echo 'test -x /usr/bin/gtk-update-icon-cache || exit 0';
-  echo '/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor'
-) | $BASEDIR/lib/postrun -b -u -t 15 -c JDS
-
+%include icon-cache.script
 
 
 %files
@@ -109,6 +107,8 @@
 
 
 %changelog
+* Tue Mar 11 2008 - [email protected]
+- Use icon-cache.script to update icon cache. Fixes 6631419.
 * Sun Nov 24 2006 - [email protected]
 - Add .desktop and icons in appropriate places.
 * Sun Jun 11 2006 - [email protected]