--- a/ChangeLog	Thu Jan 24 16:52:40 2008 +0000
+++ b/ChangeLog	Fri Jan 25 08:09:23 2008 +0000
@@ -1,3 +1,16 @@
+2008-01-25  Laszlo (Laca) Peter  <[email protected]>
+
+	Postinstall script polishing.
+
+	* SUNWevolution.spec: update list of schemas in %postun to match
+	  the contents of %files root; redirect uninstall output to /dev/null
+	  to keep the size of postrun.log reasonable
+	* SUNWgnome-applets.spec: redirect standard output of uninstall
+	  scripts to /dev/null
+	* SUNWgnome-panel.spec: a bit of optimisation in %post root:
+	  call the standard gconf-install script first and then load
+	  the panel setup data.  Send stdout to /dev/null.
+
 2008-01-24  Damien Carbery <[email protected]>
 
 	* patches/ggz-client-libs-02-compile.diff: Rework per suggestions in

--- a/SUNWevolution.spec	Thu Jan 24 16:52:40 2008 +0000
+++ b/SUNWevolution.spec	Fri Jan 25 08:09:23 2008 +0000
@@ -181,8 +181,7 @@
   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/apps-evolution-mail-prompts-checkdefault-%{evolution.major_version}.schemas';
-  echo '         $SDIR/bogo-junk-plugin.schemas';
+  echo 'schemas="$SDIR/bogo-junk-plugin.schemas';
   echo '         $SDIR/apps_evolution_addressbook.schemas';
   echo '         $SDIR/apps-evolution-attachment-reminder.schemas';
   echo '         $SDIR/apps-evolution-mail-notification.schemas';
@@ -190,7 +189,7 @@
   echo '         $SDIR/apps_evolution_calendar.schemas';
   echo '         $SDIR/apps_evolution_shell.schemas';
   echo '         $SDIR/evolution-mail.schemas"';
-  echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
+  echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas > /dev/null'
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS_wait -a
 
 

--- a/SUNWgnome-applets.spec	Thu Jan 24 16:52:40 2008 +0000
+++ b/SUNWgnome-applets.spec	Fri Jan 25 08:09:23 2008 +0000
@@ -281,7 +281,7 @@
   echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
   echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/geyes.schemas"';
-  echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
+  echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas > /dev/null'
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-intranet-applets-root
@@ -300,7 +300,7 @@
   echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
   echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/netstatus.schemas"';
-  echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
+  echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas > /dev/null'
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-mm-applets-root
@@ -319,7 +319,7 @@
   echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
   echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/mixer.schemas"';
-  echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
+  echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas > /dev/null'
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-utility-applets-root

--- a/SUNWgnome-panel.spec	Thu Jan 24 16:52:40 2008 +0000
+++ b/SUNWgnome-panel.spec	Fri Jan 25 08:09:23 2008 +0000
@@ -196,6 +196,7 @@
 ) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %post root
+%include gconf-install.script
 ( echo 'test -x /usr/bin/gconftool-2 || {';
   echo '  echo "ERROR: gconftool-2 not found"';
   echo '  exit 1';
@@ -205,11 +206,6 @@
   echo 'export GCONF_CONFIG_SOURCE';
   echo "SDIR=%{_sysconfdir}/gconf/schemas";
   echo 'retval=0';
-  echo 'for schemas in clock panel-compatibility panel-general panel-global \';
-  echo '               panel-object panel-toplevel window-list \';
-  echo '               workspace-switcher gweather; do' ;
-  echo '  /usr/bin/gconftool-2 --makefile-install-rule $SDIR/$schemas.schemas || retval=1';
-  echo 'done';
   echo '/usr/bin/gconftool-2  --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries || retval=1';
   echo '/usr/bin/gconftool-2  --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default|| retval=1';
   echo 'exit $retval'
@@ -231,7 +227,7 @@
   echo 'for schemas in clock panel-compatibility panel-general panel-global \';
   echo '               panel-object panel-toplevel window-list gweather \';
   echo '               workspace-switcher notification-daemon; do' ;
-  echo '  $PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $SDIR/$schemas.schemas || retval=1';
+  echo '  $PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $SDIR/$schemas.schemas > /dev/null || retval=1';
   echo 'done';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2  --direct --config-source=$GCONF_CONFIG_SOURCE --unload $SDIR/panel-default-setup.entries || retval=1';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2  --direct --config-source=$GCONF_CONFIG_SOURCE --unload $SDIR/panel-default-setup.entries /apps/panel/profiles/default || retval=1';