--- a/Solaris/SUNWgnome-cd.spec	Sat Jul 15 03:46:09 2006 +0000
+++ b/Solaris/SUNWgnome-cd.spec	Sat Jul 15 04:04:53 2006 +0000
@@ -55,7 +55,7 @@
 Summary:                 %{summary} - / filesystem
 SUNW_BaseDir:            /
 %include default-depend.inc
-Requires: SUNWpostrun
+Requires: SUNWpostrun-root
 Requires: SUNWgnome-config
 
 %prep
@@ -97,46 +97,46 @@
 %post
 ( echo 'test -x /usr/bin/update-desktop-database || exit 0';
   echo '/usr/bin/update-desktop-database'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS_wait
+) | $BASEDIR/lib/postrun -b -u -c JDS_wait
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %postun
-test -x $PKG_INSTALL_ROOT/usr/lib/postrun || exit 0
+test -x $BASEDIR/lib/postrun || exit 0
 ( echo 'test -x /usr/bin/update-desktop-database || exit 0';
   echo '/usr/bin/update-desktop-database'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %post root
 ( echo 'test -x /usr/bin/gconftool-2 || {';
   echo '  echo "ERROR: gconftool-2 not found"';
-  echo '  exit 0';
+  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'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -u -c JDS_wait
+) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
 
 %preun root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
+( 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:$PKG_INSTALL_ROOT/etc/gconf/gconf.xml.defaults';
+  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=$PKG_INSTALL_ROOT%{_sysconfdir}/gconf/schemas';
+  echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/sound-juicer.schemas';
   echo '         $SDIR/solaris-cdda.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -i -c JDS -a
+) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %files
 %defattr (-, root, bin)
@@ -167,6 +167,9 @@
 %{_sysconfdir}/gconf/schemas/sound-juicer.schemas
 
 %changelog
+* Fri Jul 14 2006 - [email protected]
+- update %post/%postun/etc scripts to support diskless client setup,
+  part of 6448317
 * Fri Jul 14 2006 - [email protected]
 - Install schemas file for CDDA URL Handler.
 * Thu Jun 29 2006 - [email protected]