--- a/ChangeLog	Mon Nov 05 08:15:46 2007 +0000
+++ b/ChangeLog	Mon Nov 05 10:33:09 2007 +0000
@@ -1,3 +1,10 @@
+2007-11-05  Li Yuan <[email protected]>
+
+	* SUNWgnome-a11y-gok.spec:
+	* SUNWgnome-a11y-reader.spec:
+	Use icon-cache.script for %post. Change the inline post script
+	to an include.
+
 2007-11-05  Jeff Cai<[email protected]>
 
 	* base-specs/gnutls.spec:

--- a/SUNWgnome-a11y-gok.spec	Mon Nov 05 08:15:46 2007 +0000
+++ b/SUNWgnome-a11y-gok.spec	Mon Nov 05 10:33:09 2007 +0000
@@ -101,32 +101,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
-  echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%include desktop-database-install.script
+%include scrollkeeper-update.script
+%include icon-cache.script
 
 %postun
 test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
-  echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%include desktop-database-uninstall.script
+%include scrollkeeper-update.script
 
 %post 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 root
 test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -198,6 +183,9 @@
 %endif
 
 %changelog
+* Mon Nov 05 2007 - [email protected]
+- Use icon-cache.script for %post. Change the inline post script
+  to an include.
 * Fri Oct 12 1007 - [email protected]
 - add /usr/X11/include to CFLAGS when built with FOX
 * Fri Sep 28 2007 - [email protected]

--- a/SUNWgnome-a11y-reader.spec	Mon Nov 05 08:15:46 2007 +0000
+++ b/SUNWgnome-a11y-reader.spec	Mon Nov 05 10:33:09 2007 +0000
@@ -71,6 +71,9 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%include icon-cache.script
+
 %files 
 %defattr(-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
@@ -113,6 +116,8 @@
 %endif
 
 %changelog
+* Mon Nov 05 2007 - [email protected]
+- Use icon-cache.script for %post
 * Thu Sep 27 2007 - [email protected]
 - delete some unnecessary env variables
 * Wed Aug 01 2007 - [email protected]