2008-01-03 Laszlo (Laca) Peter <
[email protected]>
* include/gconf-install.script: return 1 if gconftool-2 is not
found; redirect stdout to /dev/null so that errors are more
easily noticed and postrun.log is shorter
* SUNWevolution-exchange.spec, SUNWevolution-webcal.spec,
SUNWevolution.spec, SUNWgnome-a11y-dasher.spec,
SUNWgnome-a11y-gok.spec, SUNWgnome-a11y-poke.spec,
SUNWgnome-applets.spec, SUNWgnome-archive-mgr.spec,
SUNWgnome-calculator.spec, SUNWgnome-cd-burner.spec,
SUNWgnome-cd.spec, SUNWgnome-character-map.spec,
SUNWgnome-config-editor.spec, SUNWgnome-crash-report.spec,
SUNWgnome-desktop-prefs.spec, SUNWgnome-devhelp.spec,
SUNWgnome-file-mgr.spec, SUNWgnome-games.spec,
SUNWgnome-hex-editor.spec, SUNWgnome-im-client.spec,
SUNWgnome-img-organizer.spec, SUNWgnome-img-viewer.spec,
SUNWgnome-keyring-manager.spec, SUNWgnome-libs.spec,
SUNWgnome-media-apps.spec, SUNWgnome-media-player.spec,
SUNWgnome-media.spec, SUNWgnome-meeting.spec,
SUNWgnome-pdf-viewer.spec, SUNWgnome-pilot.spec,
SUNWgnome-print.spec, SUNWgnome-remote-desktop.spec,
SUNWgnome-session.spec, SUNWgnome-system-monitor.spec,
SUNWgnome-system-tools.spec, SUNWgnome-terminal.spec,
SUNWgnome-text-editor.spec, SUNWgnome-utils.spec, SUNWgnome-vfs.spec,
SUNWgnome-wm.spec, SUNWprint-monitor.spec, SUNWvirt-manager.spec:
%include gconf-install.script instead of inlining it.
--- a/ChangeLog Thu Jan 03 05:13:13 2008 +0000
+++ b/ChangeLog Thu Jan 03 08:23:25 2008 +0000
@@ -1,3 +1,30 @@
+2008-01-03 Laszlo (Laca) Peter <[email protected]>
+
+ * include/gconf-install.script: return 1 if gconftool-2 is not
+ found; redirect stdout to /dev/null so that errors are more
+ easily noticed and postrun.log is shorter
+ * SUNWevolution-exchange.spec, SUNWevolution-webcal.spec,
+ SUNWevolution.spec, SUNWgnome-a11y-dasher.spec,
+ SUNWgnome-a11y-gok.spec, SUNWgnome-a11y-poke.spec,
+ SUNWgnome-applets.spec, SUNWgnome-archive-mgr.spec,
+ SUNWgnome-calculator.spec, SUNWgnome-cd-burner.spec,
+ SUNWgnome-cd.spec, SUNWgnome-character-map.spec,
+ SUNWgnome-config-editor.spec, SUNWgnome-crash-report.spec,
+ SUNWgnome-desktop-prefs.spec, SUNWgnome-devhelp.spec,
+ SUNWgnome-file-mgr.spec, SUNWgnome-games.spec,
+ SUNWgnome-hex-editor.spec, SUNWgnome-im-client.spec,
+ SUNWgnome-img-organizer.spec, SUNWgnome-img-viewer.spec,
+ SUNWgnome-keyring-manager.spec, SUNWgnome-libs.spec,
+ SUNWgnome-media-apps.spec, SUNWgnome-media-player.spec,
+ SUNWgnome-media.spec, SUNWgnome-meeting.spec,
+ SUNWgnome-pdf-viewer.spec, SUNWgnome-pilot.spec,
+ SUNWgnome-print.spec, SUNWgnome-remote-desktop.spec,
+ SUNWgnome-session.spec, SUNWgnome-system-monitor.spec,
+ SUNWgnome-system-tools.spec, SUNWgnome-terminal.spec,
+ SUNWgnome-text-editor.spec, SUNWgnome-utils.spec, SUNWgnome-vfs.spec,
+ SUNWgnome-wm.spec, SUNWprint-monitor.spec, SUNWvirt-manager.spec:
+ %include gconf-install.script instead of inlining it.
+
2008-01-03 Laszlo (Laca) Peter <[email protected]>
* SUNWgnome-applets.spec: use icon-cache.script
--- a/SUNWevolution-exchange.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWevolution-exchange.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): exchange-connector
#
-# Copyright 2007 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.
#
@@ -108,15 +108,7 @@
rm -rf $RPM_BUILD_ROOT
%post 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 root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -161,6 +153,8 @@
%{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evolution.major_version}.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Oct 5 2007 - [email protected]
- add %{arch_ldadd} to LDFLAGS for GNU libiconv/libintl
* Tue Apr 24 2007 - [email protected]
--- a/SUNWevolution-webcal.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWevolution-webcal.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): exchange-webcal
#
-# 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.
#
@@ -79,15 +79,7 @@
rm -rf $RPM_BUILD_ROOT
%post 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 root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -123,6 +115,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Sat Aug 12 2006 - [email protected]
- delete some unnecessary env variables
* Fri Jul 14 2006 - [email protected]
--- a/SUNWevolution.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWevolution.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): evolution
#
-# Copyright 2007 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.
#
@@ -167,15 +167,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 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 root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -288,6 +280,8 @@
%{_sysconfdir}/gconf/schemas/evolution-mail.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Mon Nov 5 2007 - [email protected]
- Use system ldflag to enable -Bdirect
* Wed Oct 31 2006 - [email protected]
--- a/SUNWgnome-a11y-dasher.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-a11y-dasher.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): dasher
#
-# 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.
#
@@ -109,15 +109,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
@@ -164,6 +156,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Sep 28 2007 - [email protected]
- delete Nevada X deps
- delete some unneeded env vars
--- a/SUNWgnome-a11y-gok.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-a11y-gok.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gok
#
-# Copyright 2007 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.
#
@@ -183,6 +183,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Mon Nov 05 2007 - [email protected]
- Use icon-cache.script for %post. Change the inline post script
to an include.
--- a/SUNWgnome-a11y-poke.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-a11y-poke.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): accerciser
#
-# Copyright 2007 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.
#
@@ -91,15 +91,7 @@
%include desktop-database-uninstall.script
%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
@@ -169,6 +161,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Mon Nov 12 2007 - [email protected]
- Use script for post and postun.
* Thu Oct 4 2007 - [email protected]
--- 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.
--- a/SUNWgnome-archive-mgr.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-archive-mgr.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): file-roller
#
-# 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.
#
@@ -104,15 +104,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 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 root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -165,6 +157,8 @@
%{_sysconfdir}/gconf/schemas/file-roller.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Tue Apr 24 2007 - [email protected]
- s/0755/-/ in defattr so that files are not made all executable
* Mon Mar 20 2007 - [email protected]
--- a/SUNWgnome-calculator.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-calculator.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gcalctool
#
-# 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.
#
@@ -99,15 +99,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 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 root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -157,6 +149,8 @@
%{_sysconfdir}/gconf/schemas/gcalctool.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Wed Oct 31 2007 - [email protected]
- Add %{_datadir}/gcalctool to %files.
* Fri Sep 21 2007 - [email protected]
--- a/SUNWgnome-cd-burner.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-cd-burner.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-cd-burner
#
-# Copyright 2007 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.
#
@@ -102,15 +102,7 @@
rm -rf $RPM_BUILD_ROOT
%post 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 root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -170,6 +162,8 @@
%{_libdir}/pkgconfig/*
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Dec 15 2006 - [email protected]
- Added l10n package. Fixes 6314057.
* Fri Oct 20 2006 - [email protected]
--- a/SUNWgnome-cd.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-cd.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): sound-juicer
#
-# 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.
#
@@ -117,15 +117,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 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 root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -179,6 +171,8 @@
%{_sysconfdir}/gconf/schemas/sound-juicer.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Tue Jun 26 2007 - [email protected]
- remove libcdio as dependency.
* Tue Apr 24 2007 - [email protected]
--- a/SUNWgnome-character-map.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-character-map.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gucharmap
#
-# 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.
#
@@ -105,15 +105,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
@@ -173,6 +165,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Wed Nov 05 2007 - [email protected]
- Add root package and post/preun scripts for gucharmap.schemas.
* Wed Oct 10 2007 - [email protected]
--- a/SUNWgnome-config-editor.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-config-editor.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gconf-editor
#
-# 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.
#
@@ -106,15 +106,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
@@ -166,6 +158,8 @@
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Tue Dec 19 2006 - [email protected]
- Add l10n files to the l10n package.
* Fri Sep 01 2006 - [email protected]
--- a/SUNWgnome-crash-report.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-crash-report.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): bug-buddy
#
-# Copyright 2007 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.
#
@@ -112,15 +112,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
@@ -165,6 +157,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Thu Oct 4 2007 - [email protected]
- delete unneeded env vars
* Fri Sep 28 2007 - [email protected]
--- a/SUNWgnome-desktop-prefs.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-desktop-prefs.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): desktop-file-utils, control-center
#
-# Copyright 2007 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.
#
@@ -169,15 +169,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
@@ -268,6 +260,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Wed Nov 07 2007 - [email protected]
- Add new patch control-center-04-passwd-in-terminal.diff
- This is a tempoary fix for Bug#6531454 - using gnome-terminal & passwd - the
--- a/SUNWgnome-devhelp.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-devhelp.spec Thu Jan 03 08:23:25 2008 +0000
@@ -1,7 +1,7 @@
#
# spec file for package SUNWdevhelp.spec
#
-# Copyright 2007 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.
#
@@ -138,6 +138,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Wed Oct 31 2007 - [email protected]
- Change the inline postinstall script to an include.
* Tue Apr 24 2007 - [email protected]
--- a/SUNWgnome-file-mgr.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-file-mgr.spec Thu Jan 03 08:23:25 2008 +0000
@@ -4,7 +4,7 @@
# includes module(s): eel, nautilus, gnome-mount,
# gnome-volume-manager
#
-# Copyright 2007 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.
#
@@ -164,15 +164,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
@@ -267,6 +259,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Sep 28 2007 - [email protected]
- delete Nevada X dep
* Wed Sep 05 2007 - [email protected]
--- a/SUNWgnome-games.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-games.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-games, libggz, ggz-client-libs
#
-# 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.
#
@@ -120,15 +120,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
@@ -215,6 +207,8 @@
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Wed Jan 02 2008 - [email protected]
- Add ggz-client-libs module.
- Add variable to specify location of libggz sources. Add info to CFLAGS and
--- a/SUNWgnome-hex-editor.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-hex-editor.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): ghex
#
-# 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.
#
@@ -121,15 +121,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
@@ -209,6 +201,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Thu Sep 20 2007 - [email protected]
- Bump to 2.20.0.
* Wed Sep 05 2007 - [email protected]
--- a/SUNWgnome-im-client.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-im-client.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): pidgin, pidgin-otr
#
-# Copyright 2007 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.
#
@@ -115,15 +115,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
@@ -202,6 +194,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Thu Dec 06 2007 - [email protected]
- %files changed to bump to pidgin 2.3.0
* Tue Nov 16 2007 - [email protected]
--- a/SUNWgnome-img-organizer.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-img-organizer.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gthumb
#
-# Copyright 2007 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.
#
@@ -112,15 +112,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
@@ -172,6 +164,8 @@
%{_sysconfdir}/gconf/schemas/gthumb.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Sep 28 2007 - [email protected]
- delete Nevada X dep
* Tue Aug 28 2007 - [email protected]
--- a/SUNWgnome-img-viewer.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-img-viewer.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): eog
#
-# Copyright 2007 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.
#
@@ -165,15 +165,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
@@ -253,6 +245,8 @@
%{_includedir}/*
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Sep 28 2007 - [email protected]
- delete Nevada X dep
* Tue Aug 28 2007 - [email protected]
--- a/SUNWgnome-keyring-manager.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-keyring-manager.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-keyring-manager
#
-# Copyright 2007 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.
#
@@ -89,15 +89,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 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 root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -147,6 +139,8 @@
%{_sysconfdir}/gconf/schemas/gnome-keyring-manager.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Tue Apr 24 2007 - [email protected]
- use $BASEDIR instead of $PKG_INSTALL_ROOT to fix diskless install
(CR 6537817)
--- a/SUNWgnome-libs.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-libs.spec Thu Jan 03 08:23:25 2008 +0000
@@ -4,7 +4,7 @@
# includes module(s): rarian, startup-notification, libgtkhtml,
# libgnome, libbonoboui, libgnomeui, libexif-gtk
#
-# Copyright 2007 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.
#
@@ -168,15 +168,7 @@
echo '"http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0" \' ;
echo '"file://%{_datadir}/xml/scrollkeeper/dtds" %{_sysconfdir}/xml/catalog'
) | $BASEDIR/var/lib/postrun/postrun -c JDS
-( 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
@@ -314,6 +306,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Oct 26 2007 - [email protected]
- Add Build/Requires SUNWlibC after check-deps.pl run.
* Thu Oct 25 2007 - [email protected]
--- 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.
--- a/SUNWgnome-media-player.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-media-player.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): totem
#
-# Copyright 2007 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 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
@@ -268,6 +260,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Mon Dec 03 2007 - [email protected]
- Add totem-pl-parser.
* Thu Nov 08 2007 - [email protected]
--- a/SUNWgnome-media.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-media.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gst, gst-plugins-base, gst-plugins-good
#
-# Copyright 2007 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.
#
@@ -169,15 +169,7 @@
rm -rf $RPM_BUILD_ROOT
%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
@@ -240,6 +232,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Sep 28 2007 - [email protected]
- delete SUNWxwrtl dep
* Thu Aug 02 2007 - [email protected]
--- a/SUNWgnome-meeting.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-meeting.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): pwlib, opal, ekiga
#
-# Copyright 2007 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.
#
@@ -184,15 +184,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
@@ -246,6 +238,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Wed Nov 14 2007 - [email protected]
- Add Build/Requires SUNWavahi-bridge-dsd/-devel as required by ekiga.
* Thu Oct 11 2007 - [email protected]
--- a/SUNWgnome-pdf-viewer.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-pdf-viewer.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): poppler, poppler-data, evince
#
-# Copyright 2007 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.
#
@@ -158,15 +158,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
@@ -235,6 +227,8 @@
%{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Tue Nov 13 2007 - [email protected]
- Add evince manpage.
* Fri Sep 28 2007 - [email protected]
--- a/SUNWgnome-pilot.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-pilot.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-pilot
#
-# Copyright 2007 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.
#
@@ -129,15 +129,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
@@ -203,6 +195,8 @@
%{_sysconfdir}/gconf/schemas/pilot.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Wed Nov 22 2007 - [email protected]
- Remove some unuseful files from the package.
* Sun Oct 7 2007 - [email protected]
--- a/SUNWgnome-print.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-print.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): libgnomeprint, libgnomeprintui
#
-# Copyright 2007 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.
#
@@ -190,15 +190,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,6 +264,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Thu Sep 27 2007 - [email protected]
- delete some unnecessary env variables
* Tue Apr 24 2007 - [email protected]
--- a/SUNWgnome-remote-desktop.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-remote-desktop.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): vino, realvnc-java-client
#
-# 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.
#
@@ -164,6 +164,8 @@
%{_sysconfdir}/gconf/schemas/vino-server.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Nov 02 2007 - [email protected]
- Remove vncviewer wrapper since C version of vncviewer will be added.
* Fri Nov 02 2007 - [email protected]
--- a/SUNWgnome-session.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-session.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-session
#
-# Copyright 2007 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.
#
@@ -108,15 +108,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
@@ -167,6 +159,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Sep 28 2007 - [email protected]
- delete Nevada X deps
- delete some unneeded env vars
--- a/SUNWgnome-system-monitor.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-system-monitor.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-system-monitor
#
-# Copyright 2007 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.
#
@@ -115,15 +115,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
@@ -178,6 +170,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Thu Oct 11 2007 - [email protected]
- Remove install dependency on SUNWgnome-doc-utils and change the build
dependency from SUNWgnome-doc-utils-devel to SUNWgnome-doc-utils.
--- a/SUNWgnome-system-tools.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-system-tools.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-system-tools, system-tools-backends
#
-# 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.
#
@@ -135,15 +135,7 @@
rm -rf $RPM_BUILD_ROOT
%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
@@ -207,6 +199,8 @@
%config %class(rbac) %attr (0644, root, sys) %{_sysconfdir}/security/exec_attr
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Thu Oct 11 2007 - [email protected]
- Remove install dependency on SUNWgnome-doc-utils and change the build
dependency from SUNWgnome-doc-utils-devel to SUNWgnome-doc-utils.
--- a/SUNWgnome-terminal.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-terminal.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): vte gnome-terminal
#
-# Copyright 2007 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.
#
@@ -133,15 +133,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
@@ -213,6 +205,8 @@
%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Tue Nov 06 2007 - [email protected]
- Add -R/usr/sfw/lib to LDFLAGS (-L/usr/sfw/lib was already there)
* Fri Sep 28 2007 - [email protected]
--- a/SUNWgnome-text-editor.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-text-editor.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gedit gtksourceview
#
-# Copyright 2007 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.
#
@@ -131,15 +131,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
@@ -205,6 +197,8 @@
%{_includedir}/*
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Sun Oct 07 2007 - [email protected]
- Add python plugin dirs, now installed because pygtksourceview is part of
SUNWgnome-python-libs.
--- a/SUNWgnome-utils.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-utils.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-utils
#
-# Copyright 2007 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.
#
@@ -288,15 +288,7 @@
) | $BASEDIR/lib/postrun -b -u -c JDS
%post -n SUNWgnome-disk-analyzer-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-disk-analyzer-root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -315,15 +307,7 @@
) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
%post -n SUNWgnome-log-viewer-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-log-viewer-root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -342,15 +326,7 @@
) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
%post -n SUNWgnome-search-tool-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-search-tool-root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -369,15 +345,7 @@
) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
%post -n SUNWgnome-dictionary-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-dictionary-root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -396,15 +364,7 @@
) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
%post -n SUNWgnome-screenshot-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-screenshot-root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -556,6 +516,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Wed Oct 10 2007 - [email protected]
- Remove 'Requires: SUNWgnome-doc-utils' as it is only used during building;
change SUNWgnome-doc-utils-devel to SUNWgnome-doc-utils to match change in
--- a/SUNWgnome-vfs.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-vfs.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-mime-data, gnome-vfs
#
-# Copyright 2007 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.
#
@@ -128,15 +128,7 @@
) | $BASEDIR/lib/postrun -b -u -c JDS_wait
%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
@@ -215,6 +207,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Thu May 17 2007 - [email protected]
- delete SUNWsmbaS dependency and related CFLAGS, since 6267187 was
fixed in snv_40.
--- a/SUNWgnome-wm.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWgnome-wm.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): metacity
#
-# 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.
#
@@ -108,15 +108,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
%ifarch sparc
( echo 'test -x /usr/bin/gconftool-2 || {';
@@ -186,6 +178,8 @@
%endif
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Sep 28 2007 - [email protected]
- delete SUNWxwrtl and SUNWxorg-clientlibs deps
- delete some unnecessary env variables
--- a/SUNWprint-monitor.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWprint-monitor.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): ospm
#
-# Copyright 2007 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.
#
@@ -106,15 +106,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
@@ -167,6 +159,8 @@
%config %class(rbac) %attr (0644, root, sys) %{_sysconfdir}/security/exec_attr
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Sep 28 2007 - [email protected]
- delete SUNWxwrtl dependency, twice...
* Tue Jul 10 2007 - [email protected]
--- a/SUNWvirt-manager.spec Thu Jan 03 05:13:13 2008 +0000
+++ b/SUNWvirt-manager.spec Thu Jan 03 08:23:25 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): virt-manager
#
-# Copyright (c) 2006 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.
#
@@ -74,15 +74,7 @@
%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
@@ -142,6 +134,8 @@
%changelog
+* Thu Jan 3 2008 - [email protected]
+- use gconf-install.script instead of an inline script
* Fri Jun 22 2007 - [email protected]
- comment out Xen-team deps until they are integrated.
* Thu Jun 21 2007 - [email protected]
--- a/include/gconf-install.script Thu Jan 03 05:13:13 2008 +0000
+++ b/include/gconf-install.script Thu Jan 03 08:23:25 2008 +0000
@@ -1,9 +1,9 @@
( 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'
+ echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null'
) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait