--- a/SUNWnwam-manager.spec	Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWnwam-manager.spec	Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): nwam-manager
 #
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -32,6 +32,7 @@
 Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-session
 Requires: SUNWcslr
+Requires: SUNWdesktop-cache
 
 %package root
 Summary:                 %{summary} - / filesystem
@@ -77,29 +78,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%include icon-cache.script
-
-%post root
-
-%include gconf-install.script
-
-%preun root
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
-  echo '  echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
-  echo '  exit 0';
-  echo '}';
-  echo 'umask 0022';
-  echo 'GCONF_CONFIG_SOURCE=xml:merged:$BASEDIR/etc/gconf/gconf.xml.defaults';
-  echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
-  echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
-  echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
-  echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
-  echo 'schemas="$SDIR/nwam-manager.schemas"';
-  echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri icon-cache gconf-cache
 
 %files
 %defattr (-, root, bin)
@@ -153,6 +132,8 @@
 %endif
 
 %changelog
+* Fri Apr  3 2009 - [email protected]
+- use desktop-cache instead of postrun
 * Mon Sep 15 2008 - [email protected]
 - Update copyright (thanks to Matt for the changes).
 * Mon Sep 8 2008 - [email protected]