--- a/SUNWgnome-applets.spec	Sun Apr 22 12:37:51 2007 +0000
+++ b/SUNWgnome-applets.spec	Mon Apr 23 03:29:44 2007 +0000
@@ -415,7 +415,19 @@
   echo 'umask 0022';
   echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
   echo 'export GCONF_CONFIG_SOURCE';
+  echo 'JDS_LIST1=/apps/panel/default_setup/general/applet_id_list_jds';
+  echo 'JDS_LIST2=/apps/panel/profiles/default/general/applet_id_list_jds';
   echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas'
+  echo 'test -c /devices/pseudo/battery@0:battery0 && {';
+  echo '	/usr/bin/gconftool-2  --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup-laptop.entries';
+  echo '	/usr/bin/gconftool-2  --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup-laptop.entries /apps/panel/profiles/default';
+  echo '	APPLETS=`gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --get $JDS_LIST1 | sed  -n "s/\(\[.*\)\]/\1,battstat]/p"`'
+  echo '	gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --unset $JDS_LIST1'
+  echo '	gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --type=list --list-type=string --set $JDS_LIST1 $APPLETS'
+  echo '	APPLETS=`gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --get $JDS_LIST2 | sed  -n "s/\(\[.*\)\]/\1,battstat]/p"`'
+  echo '	gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --unset $JDS_LIST2'
+  echo '	gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --type=list --list-type=string --set $JDS_LIST2 $APPLETS'
+  echo '}';
 ) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
 
 %preun -n SUNWgnome-utility-applets-root
@@ -427,15 +439,28 @@
   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 'JDS_LIST1=/apps/panel/default_setup/general/applet_id_list_jds';
+  echo 'JDS_LIST2=/apps/panel/profiles/default/general/applet_id_list_jds';
   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/charpick.schemas';
+  echo '         $SDIR/battstat.schemas';
   echo '         $SDIR/deskbar-applet.schemas';
   echo '         $SDIR/quick-lounge.schemas';
   echo '         $SDIR/multiload.schemas';
   echo '         $SDIR/stickynotes.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
+  echo 'test -c /devices/pseudo/battery@0:battery0 && {';
+  echo '	$PKG_INSTALL_ROOT/usr/bin/gconftool-2  --direct --config-source=$GCONF_CONFIG_SOURCE --unload $SDIR/panel-default-setup-laptop.entries';
+  echo '	$PKG_INSTALL_ROOT/usr/bin/gconftool-2  --direct --config-source=$GCONF_CONFIG_SOURCE --unload $SDIR/panel-default-setup-laptop.entries /apps/panel/profiles/default';
+  echo '	APPLETS=`gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --get $JDS_LIST1 | sed  -n "s/\(\[.*\),battstat\(\]\)/\1\\2/p"`';
+  echo '	gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --unset $JDS_LIST1'
+  echo '	gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --type=list --list-type=string --set $JDS_LIST1 $APPLETS'
+  echo '	APPLETS=`gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --get $JDS_LIST2 | sed  -n "s/\(\[.*\),battstat\(\]\)/\1\\2/p"`';
+  echo '	gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --unset $JDS_LIST2'
+  echo '	gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --owner=panel --type=list --list-type=string --set $JDS_LIST2 $APPLETS'
+  echo '}';
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %files
@@ -653,6 +678,7 @@
 %{_sysconfdir}/gconf/schemas/deskbar-applet.schemas
 %{_sysconfdir}/gconf/schemas/multiload.schemas
 %{_sysconfdir}/gconf/schemas/battstat.schemas
+%{_sysconfdir}/gconf/schemas/panel-default-setup-laptop.entries
 %{_sysconfdir}/sound/events/battstat_applet.soundlist
 
 %files -n SUNWgnome-utility-applets-devel