--- a/SUNWgnome-media-apps.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-media-apps.spec Thu Jan 03 08:23:25 2008 +0000
@@ -4,7 +4,7 @@
#
# includes module(s): gnome-media
#
-# Copyright (c) 2004 Sun Microsystems, Inc.
+# Copyright 2008 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -180,15 +180,7 @@
) | $BASEDIR/lib/postrun -b -u -c JDS
%post -n SUNWgnome-sound-recorder-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-sound-recorder-root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -224,15 +216,7 @@
) | $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 '}';
- 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 root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -272,15 +256,7 @@
) | $BASEDIR/lib/postrun -b -u -c JDS
%post -n SUNWgnome-freedb-libs-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-freedb-libs-root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -423,6 +399,8 @@
%{_datadir}/idl
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Mon Oct 8 2007 - [email protected]
- Remove some icons from base package because they are already in
SUNWgnome-sound-recorder. Fixes 6613798.