SUNWgnome-applets.spec
changeset 11370 338c15c66cee
parent 11368 6f9cfb174a8c
child 11478 af99b2737279
--- a/SUNWgnome-applets.spec	Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-applets.spec	Thu Jan 03 08:23:25 2008 +0000
@@ -279,15 +279,7 @@
 %include icon-cache.script
 
 %post -n SUNWgnome-fun-applets-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 -n SUNWgnome-fun-applets-root
 test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -306,15 +298,7 @@
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-internet-applets-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 -n SUNWgnome-internet-applets-root
 test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -333,15 +317,7 @@
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-intranet-applets-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 -n SUNWgnome-intranet-applets-root
 test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -360,15 +336,7 @@
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-mm-applets-root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
-  echo '  exit 0';
-  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 -n SUNWgnome-mm-applets-root
 test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -387,6 +355,7 @@
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-utility-applets-root
+%include gconf-install.script
 ( echo 'test -x /usr/bin/gconftool-2 || {';
   echo '  echo "ERROR: gconftool-2 not found"';
   echo '  exit 1';
@@ -396,7 +365,6 @@
   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';
@@ -689,6 +657,8 @@
 
 %changelog
 * Thu Jan  3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
+* Thu Jan  3 2008 - [email protected]
 - use includes instead of inline scripts
 * Thu Oct 11 2007 - [email protected]
 - Fix packaging so that invest applet's python code gets installed.