--- a/ChangeLog Fri Apr 03 10:46:38 2009 +0000
+++ b/ChangeLog Fri Apr 03 12:08:32 2009 +0000
@@ -1,3 +1,44 @@
+2009-04-03 Laszlo (Laca) Peter <[email protected]>
+
+ * SUNWcheese.spec, SUNWdesktop-search.spec, SUNWdrivel.spec,
+ SUNWevolution-exchange.spec, SUNWevolution-webcal.spec,
+ SUNWevolution.spec, SUNWfirefox.spec, SUNWglibmm.spec,
+ SUNWgnome-a11y-dasher.spec, SUNWgnome-a11y-gok.spec,
+ SUNWgnome-a11y-libs.spec, SUNWgnome-a11y-mousetweaks.spec,
+ SUNWgnome-a11y-poke.spec, SUNWgnome-applets.spec,
+ SUNWgnome-archive-mgr.spec, SUNWgnome-base-libs.spec,
+ SUNWgnome-calculator.spec, SUNWgnome-camera.spec,
+ SUNWgnome-cd-burner.spec, SUNWgnome-cd.spec,
+ SUNWgnome-character-map.spec, SUNWgnome-commander.spec,
+ SUNWgnome-config-editor.spec, SUNWgnome-crash-report.spec,
+ SUNWgnome-desklets-extra.spec, SUNWgnome-desklets.spec,
+ SUNWgnome-desktop-prefs.spec, SUNWgnome-devel-docs.spec,
+ SUNWgnome-devhelp.spec, SUNWgnome-dialog.spec,
+ SUNWgnome-display-mgr.spec, SUNWgnome-doc-utils.spec,
+ SUNWgnome-file-mgr.spec, SUNWgnome-games.spec,
+ SUNWgnome-gui-test.spec, SUNWgnome-help-viewer.spec,
+ SUNWgnome-hex-editor.spec, SUNWgnome-im-client.spec,
+ SUNWgnome-img-editor.spec, SUNWgnome-img-organizer.spec,
+ SUNWgnome-img-viewer.spec, SUNWgnome-libs.spec,
+ SUNWgnome-media-apps.spec, SUNWgnome-media-player.spec,
+ SUNWgnome-media.spec, SUNWgnome-meeting.spec,
+ SUNWgnome-menu-editor.spec, SUNWgnome-nettool.spec,
+ SUNWgnome-panel.spec, SUNWgnome-pdf-viewer.spec,
+ SUNWgnome-pilot.spec, SUNWgnome-power-manager.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-themes.spec,
+ SUNWgnome-ui-designer.spec, SUNWgnome-user-docs.spec,
+ SUNWgnome-utils.spec, SUNWgnome-vfs.spec, SUNWgnome-wm.spec,
+ SUNWhamster.spec, SUNWlibcanberra.spec, SUNWlibgsf.spec,
+ SUNWlibrsvg.spec, SUNWnwam-manager.spec, SUNWprint-monitor.spec,
+ SUNWseahorse.spec, SUNWthunderbird.spec, SUNWvinagre.spec,
+ SUNWvirt-manager.spec: use desktop-cache instead of postrun;
+ replace %post and %postun scripts with calls to restart_fmri,
+ as script that pings an smf service.
+ * include/prod.inc: define %restart_fmri
+
2009-04-03 Matt Keenan <[email protected]>
* base-spacs/gnome-panel.spec : Add patch 16-set-default-location-crash.diff
--- a/SUNWcheese.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWcheese.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,6 +3,10 @@
#
# includes module(s): cheese
#
+# Copyright 2009 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
# Owner: elaine
#
@@ -41,8 +45,8 @@
Requires: SUNWgnome-config
Requires: SUNWhal
Requires: SUNWlibrsvg
-Requires: SUNWpostrun
Requires: SUNWxwrtl
+Requires: SUNWdesktop-cache
BuildRequires: SUNWdbus-devel
BuildRequires: SUNWevolution-data-server-devel
BuildRequires: SUNWgnome-base-libs-devel
@@ -55,7 +59,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
Requires: SUNWgnome-config
%if %build_l10n
@@ -110,42 +113,14 @@
%post
-%include desktop-database-install.script
-%include scrollkeeper-update.script
-( echo 'test -x %{_bindir}/update-mime-database || exit 0';
- echo '%{_bindir}/update-mime-database %{_datadir}/mime'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-%include icon-cache.script
+%restart_fmri gconf-cache desktop-mime-cache icon-cache mime-types-cache
%postun
-%include desktop-database-uninstall.script
-%include scrollkeeper-update.script
-( echo 'test -x %{_bindir}/update-mime-database || exit 0';
- echo '%{_bindir}/update-mime-database %{_datadir}/mime'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+%restart_fmri desktop-mime-cache mime-types-cache
%clean
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/cheese.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
-
%files
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_bindir}
@@ -207,6 +182,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Feb 10 2009 - [email protected]
- Add dependency on SUNWlibrsvg, CR #6755918
* Sun Sep 21 2008 - [email protected]
--- a/SUNWdesktop-search.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWdesktop-search.spec Fri Apr 03 12:08:32 2009 +0000
@@ -77,7 +77,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
%if %build_l10n
%package l10n
--- a/SUNWdrivel.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWdrivel.spec Fri Apr 03 12:08:32 2009 +0000
@@ -33,6 +33,8 @@
Requires: SUNWgtkspell
Requires: SUNWgnu-idn
Requires: SUNWcurl
+Requires: %{name}-root
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWgnome-gtksourceview-devel
@@ -51,7 +53,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
%prep
rm -rf %name-%version
@@ -86,32 +87,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include desktop-database-install.script
-%include icon-cache.script
+%restart_fmri desktop-mime-cache icon-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/drivel.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
-
+%restart_fmri desktop-mime-cache
%files
%doc -d drivel-%{drivel.version} README AUTHORS
@@ -165,6 +144,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 9 2009 - [email protected]
- Add ifnarch sparc so that it only build at i386/x64 platform
* Wed Feb 11 2009 - [email protected]
--- a/SUNWevolution-exchange.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWevolution-exchange.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): exchange-connector
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -41,6 +41,8 @@
Requires: SUNWlxml
Requires: SUNWmlib
Requires: SUNWzlib
+Requires: %{name}-root
+Requires: SUNWdesktop-cache
BuildRequires: SUNWevolution-data-server-devel
BuildRequires: SUNWevolution-libs-devel
BuildRequires: SUNWlibsoup-devel
@@ -60,7 +62,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
Requires: SUNWgnome-config
%if %build_l10n
@@ -110,24 +111,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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_exchange_addressbook-%{evolution.major_version}.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
+%post
+%restart_fmri gconf-cache
%files
%doc -d evolution-exchange-%{evoexchange.version} AUTHORS
@@ -160,6 +145,8 @@
%{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evolution.major_version}.schemas
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Fri Sep 19 2008 - [email protected]
- Set permissions on /usr/share/doc.
* Wed Sep 16 2008 - [email protected]
--- a/SUNWevolution-webcal.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWevolution-webcal.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): exchange-webcal
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -29,6 +29,8 @@
Requires: SUNWgnome-component
Requires: SUNWgnome-config
Requires: SUNWgnome-libs
+Requires: %{name}-root
+Requires: SUNWdesktop-cache
BuildRequires: SUNWevolution-data-server-devel
BuildRequires: SUNWevolution-libs-devel
BuildRequires: SUNWgnome-base-libs-devel
@@ -41,8 +43,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -89,24 +89,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/evolution-webcal.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%post
+%restart_fmri gconf-cache
%files
%doc -d evolution-webcal-%{webcal.version} AUTHORS
@@ -134,6 +118,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Fri Oct 10 2008 - [email protected]
- Ship manpage.
* Fri Sep 19 2008 - [email protected]
--- a/SUNWevolution.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWevolution.spec Fri Apr 03 12:08:32 2009 +0000
@@ -1,9 +1,8 @@
-
# spec file for package SUNWevolution
#
# includes module(s): evolution
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -52,7 +51,7 @@
Requires: SUNWlibgpg-error
Requires: SUNWmlib
Requires: SUNWzlib
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWpr
Requires: SUNWgnome-media
%{?with_pilot_link:Requires: SUNWpilot-link}
@@ -91,8 +90,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -157,41 +154,10 @@
# replace the old scripts with script files
%post
-%include desktop-database-install.script
-%include scrollkeeper-update.script
-%include icon-cache.script
+%restart_fmri gconf-cache desktop-mime-cache icon-cache
%postun
-%include desktop-database-uninstall.script
-%include scrollkeeper-update.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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_addressbook.schemas';
- echo ' $SDIR/apps-evolution-attachment-reminder.schemas';
- echo ' $SDIR/apps_evolution_email_custom_header.schemas';
- echo ' $SDIR/apps-evolution-mail-notification.schemas';
- echo ' $SDIR/apps-evolution-mail-prompts-checkdefault.schemas';
- echo ' $SDIR/apps_evolution_calendar.schemas';
- echo ' $SDIR/apps_evolution_shell.schemas';
- echo ' $SDIR/evolution-mail.schemas';
- echo ' $SDIR/apps-evolution-template-placeholders.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
-
+%restart_fmri desktop-mime-cache
%files
@@ -288,6 +254,8 @@
%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Oct 16 2008 - [email protected]
- Update copyright, add file COPYING.LGPL2.
* Tue Sep 16 2008 - [email protected]
--- a/SUNWfirefox.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWfirefox.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): firefox
#
-# Copyright 2007 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -59,7 +59,7 @@
BuildRequires: SUNWgnome-vfs-devel
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWgnome-base-libs-devel
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%if %option_with_indiana_branding
Requires: SUNWgetting-started-guide
%endif
@@ -136,10 +136,7 @@
#########################################
%post
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+%restart_fmri desktop-mime-cache || exit 1
PKGCOND=/usr/bin/pkgcond
test -x $PKGCOND || exit 0
@@ -155,10 +152,7 @@
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache || exit 1
PKGCOND=/usr/bin/pkgcond
test -x $PKGCOND || exit 0
@@ -242,6 +236,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 30 2009 - [email protected]
- Correction for build dependency of nss, nspr.
* Mon Mar 23 2009 - [email protected]
--- a/SUNWglibmm.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWglibmm.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): glibmm
#
-# # Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -26,6 +26,7 @@
Requires: SUNWsigcpp
BuildRequires: SUNWsigcpp-devel
Requires: SUNWperl584core
+Requires: SUNWdesktop-cache
%package devel
Summary: %{summary} - development files
@@ -83,13 +84,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include desktop-database-install.script
-%include scrollkeeper-update.script
+%restart_fmri desktop-mime-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-%include scrollkeeper-update.script
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -119,6 +117,8 @@
%{_includedir}/*
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 23 2009 - [email protected]
- Since /usr/lib/glibmm-2.4/proc/beautify_docs.pl (SUNWglibmm) requires
/usr/perl5/5.8.4/bin/perl5.8.4 which is found in SUNWperl584core, add
--- a/SUNWgnome-a11y-dasher.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-a11y-dasher.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): dasher
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -41,14 +41,13 @@
Requires: SUNWlibpopt
Requires: SUNWlibC
Requires: SUNWlibms
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
+Requires: %{name}-root
%package root
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -93,40 +92,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/dasher.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -162,6 +131,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Fri Sep 11 2008 - [email protected]
- Add new copyright files.
* Wed Apr 02 2008 - [email protected]
--- a/SUNWgnome-a11y-gok.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-a11y-gok.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gok
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -33,7 +33,7 @@
Requires: SUNWgnome-config
Requires: SUNWlibms
Requires: SUNWlxml
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-audio-devel
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-component-devel
@@ -46,8 +46,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -102,33 +100,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include desktop-database-install.script
-%include scrollkeeper-update.script
-%include icon-cache.script
+%restart_fmri desktop-mime-cache icon-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-%include scrollkeeper-update.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gok.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -190,6 +165,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Mar 24 2009 - [email protected]
- Add %{_datadir}/gok/C/*.kbd. doo 2552.
* Tue Mar 17 2009 - [email protected]
--- a/SUNWgnome-a11y-libs.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-a11y-libs.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): at-spi java-access-bridge libgail-gnome freetts gnome-mag pyspi
#
-# Copyright 2007 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -56,6 +56,8 @@
Requires: SUNWzoner
Requires: SUNWzoneu
Requires: SUNWpkgcmdsu
+Requires: %{name}-root
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-config-devel
@@ -275,24 +277,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/at-spi.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%post
+%restart_fmri gconf-cache
%files
%defattr (-, root, bin)
@@ -398,6 +384,8 @@
%{_libdir}/python2.6/vendor-packages/*
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Mar 25 2009 - [email protected]
- Move pyspi from SUNWgnome-python-libs to SUNWgnome-a11y-libs.
* Tue Mar 24 2009 - [email protected]
--- a/SUNWgnome-a11y-mousetweaks.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-a11y-mousetweaks.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): mousetweaks
#
-# Copyright (c) 2005 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -37,7 +37,7 @@
Requires: SUNWgnome-a11y-libs
Requires: SUNWdbus-glib
Requires: SUNWgnome-libs
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: %{name}-root
BuildRequires: SUNWgnome-config-devel
@@ -51,8 +51,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -96,32 +94,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include desktop-database-install.script
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( 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:$PKG_INSTALL_ROOT/etc/gconf/gconf.xml.defaults';
- echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
- echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
- echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
- echo 'SDIR=$PKG_INSTALL_ROOT%{_sysconfdir}/gconf/schemas';
- echo 'schemas="$SDIR/mousetweaks.schemas';
- echo ' $SDIR/pointer-capture-applet.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
-
+%restart_fmri desktop-mime-cache
%files
%defattr(-,root,bin)
@@ -156,9 +132,9 @@
%{_sysconfdir}/gconf/schemas/mousetweaks.schemas
%{_sysconfdir}/gconf/schemas/pointer-capture-applet.schemas
-
-
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Mar 05 2009 - [email protected]
- Change SUNWdbus-bindings to SUNWdbus-glib.
* Thu Oct 30 2008 - [email protected]
--- a/SUNWgnome-a11y-poke.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-a11y-poke.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): accerciser
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -27,6 +27,8 @@
Requires: SUNWgnome-base-libs
Requires: SUNWIPython
Requires: SUNWgnome-config
+Requires: %{name}-root
+Requires: SUNWdesktop-cache
BuildRequires: SUNWPython-devel
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-python-libs-devel
@@ -45,8 +47,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -84,31 +84,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include desktop-database-install.script
-%include icon-cache.script
+%restart_fmri desktop-mime-cache icon-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/accerciser.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr(-,root,bin)
@@ -164,6 +143,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Sep 18 2008 - [email protected]
- Added %doc to %files for copyright.
* Mon Mar 31 2008 - [email protected]
--- a/SUNWgnome-applets.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-applets.spec Fri Apr 03 12:08:32 2009 +0000
@@ -4,7 +4,7 @@
# includes module(s): gnome-applets, quick-lounge-applet
# gnome-netstatus, deskbar-applet
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -67,14 +67,12 @@
Requires: SUNWgnome-base-libs
Requires: SUNWgnome-config
Requires: SUNWlibms
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%package -n SUNWgnome-fun-applets-root
Summary: %{summary} - amusements - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package -n SUNWgnome-internet-applets
Summary: %{summary} - internet
@@ -88,7 +86,6 @@
Requires: SUNWgnome-vfs
Requires: SUNWlibms
Requires: SUNWlxml
-Requires: SUNWpostrun
Requires: SUNWPython
%package -n SUNWgnome-intranet-applets
@@ -102,14 +99,12 @@
Requires: SUNWgnome-base-libs
Requires: SUNWgnome-config
Requires: SUNWlibms
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%package -n SUNWgnome-intranet-applets-root
Summary: %{summary} - intranet - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package -n SUNWgnome-mm-applets
Summary: %{summary} - multimedia
@@ -123,14 +118,12 @@
Requires: SUNWgnome-base-libs
Requires: SUNWgnome-config
Requires: SUNWlibms
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%package -n SUNWgnome-mm-applets-root
Summary: %{summary} - multimedia - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package -n SUNWgnome-utility-applets
Summary: %{summary} - utility
@@ -149,7 +142,7 @@
Requires: SUNWevolution-data-server
Requires: SUNWlxml
Requires: SUNWlibms
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWPython
Requires: SUNWhal
@@ -157,8 +150,6 @@
Summary: %{summary} - utility - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package -n SUNWgnome-utility-applets-devel
Summary: %{summary} - utility - development files
@@ -236,121 +227,16 @@
rm -rf $RPM_BUILD_ROOT
%post -n SUNWgnome-fun-applets
-%include scrollkeeper-update.script
-%include icon-cache.script
-
-%postun -n SUNWgnome-fun-applets
-%include scrollkeeper-update.script
-%include icon-cache.script
-
-%post -n SUNWgnome-internet-applets
-%include scrollkeeper-update.script
-
-%postun -n SUNWgnome-internet-applets
-%include scrollkeeper-update.script
+%restart_fmri icon-cache gconf-cache
%post -n SUNWgnome-intranet-applets
-%include scrollkeeper-update.script
-%include icon-cache.script
-
-%postun -n SUNWgnome-intranet-applets
-%include scrollkeeper-update.script
-%include icon-cache.script
-
-%post -n SUNWgnome-mm-applets
-%include scrollkeeper-update.script
-
-%postun -n SUNWgnome-mm-applets
-%include scrollkeeper-update.script
+%restart_fmri icon-cache gconf-cache
%post -n SUNWgnome-utility-applets
-%include scrollkeeper-update.script
-%include icon-cache.script
-
-%postun -n SUNWgnome-utility-applets
-%include scrollkeeper-update.script
-%include icon-cache.script
-
-%post -n SUNWgnome-fun-applets-root
-%include gconf-install.script
-
-%preun -n SUNWgnome-fun-applets-root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/geyes.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
-%include gconf-install.script
+%restart_fmri icon-cache gconf-cache
-%preun -n SUNWgnome-intranet-applets-root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/netstatus.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
-%include gconf-install.script
-
-%preun -n SUNWgnome-mm-applets-root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/mixer.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
-%include gconf-install.script
-
-%preun -n SUNWgnome-utility-applets-root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%post -n SUNWgnome-mm-applets
+%restart_fmri gconf-cache
%files
%doc -d gnome-applets-%{gapplets.version} README stickynotes/README cpufreq/README geyes/README mini-commander/README trashapplet/README gkb-new/README null_applet/README AUTHORS gweather/AUTHORS cpufreq/AUTHORS geyes/AUTHORS multiload/AUTHORS mini-commander/AUTHORS drivemount/AUTHORS gkb-new/AUTHORS accessx-status/AUTHORS mixer/AUTHORS modemlights/AUTHORS COPYING-DOCS accessx-status/COPYING COPYING MAINTAINERS
@@ -616,6 +502,8 @@
# %{_datadir}/omf/gnome-netstatus/*-[a-z][a-z]_*.omf
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Apr 02 2009 - [email protected]
- Add SUNWhal as a dependency since the Battery Status applet uses it.
* Mon Mar 23 2009 - [email protected]
--- a/SUNWgnome-archive-mgr.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-archive-mgr.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): file-roller
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -32,7 +32,7 @@
Requires: SUNWgnome-base-libs
Requires: SUNWlibms
Requires: SUNWlibpopt
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWlibpopt-devel
@@ -48,8 +48,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -88,40 +86,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/file-roller.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -162,6 +130,8 @@
%{_sysconfdir}/gconf/schemas/file-roller.schemas
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Mar 17 2009 - [email protected]
- Add %{_datadir}/omf/*/*-[a-z][a-z]_[A-Z][A-Z].omf in %files l10n.
* Wed Sep 10 2008 - [email protected]
--- a/SUNWgnome-base-libs.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-base-libs.spec Fri Apr 03 12:08:32 2009 +0000
@@ -4,7 +4,7 @@
# includes module(s): glib, cairo, pango, atk, gtk+, libglade,
# libart_lgpl, libgnomecanvas
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
--- a/SUNWgnome-calculator.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-calculator.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gcalctool
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -28,7 +28,7 @@
Requires: SUNWgnome-config
Requires: SUNWlibms
BuildRequires: SUNWgnome-config-devel
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%if %build_l10n
%package l10n
@@ -42,8 +42,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -83,40 +81,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gcalctool.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -150,6 +118,8 @@
%{_sysconfdir}/gconf/schemas/gcalctool.schemas
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Jan 3 2008 - [email protected]
- use gconf-install.script instead of an inline script
* Wed Oct 31 2007 - [email protected]
--- a/SUNWgnome-camera.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-camera.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): libgphoto2, gphoto2, gtkam
#
-# Copyright 2007 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -33,7 +33,7 @@
Requires: SUNWlibms
Requires: SUNWlibpopt
Requires: SUNWmlib
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWdbus
Requires: SUNWdsdu
Requires: SUNWltdl
@@ -118,21 +118,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -209,6 +198,8 @@
%{_libdir}/pkgconfig/*
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Sep 10 2008 - [email protected]
- Update copyright
* Fri Aug 29 2008 - [email protected]
--- a/SUNWgnome-cd-burner.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-cd-burner.spec Fri Apr 03 12:08:32 2009 +0000
@@ -1,7 +1,7 @@
#
# spec file for package brasero
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -33,7 +33,8 @@
BuildRequires: SUNWlxml-devel
BuildRequires: SUNWdbus-devel
BuildRequires: SUNWhal
-Requires: SUNWpostrun
+Requires: %{name}-root
+Requires: SUNWdesktop-cache
Requires: SUNWdbus
Requires: SUNWgnome-base-libs
Requires: SUNWgnome-media
@@ -54,8 +55,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -164,32 +163,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include icon-cache.script
-%include desktop-database-install.script
+%restart_fmri icon-cache desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include icon-cache.script
-%include desktop-database-uninstall.script
-
-%post root
-%include gconf-install.script
-
-%postun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/brasero.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%doc README AUTHORS
@@ -247,6 +224,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Mar 17 2009 - [email protected]
- Bump to 2.26.0
* Wed Mar 11 2009 - [email protected]
--- a/SUNWgnome-cd.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-cd.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): sound-juicer
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -40,7 +40,8 @@
Requires: SUNWlibC
Requires: SUNWlibms
Requires: SUNWmusicbrainz
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
+Requires: %{name}-root
%if %build_l10n
%package l10n
@@ -54,8 +55,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -138,41 +137,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/sound-juicer.schemas';
- echo ' $SDIR/solaris-cdda.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -216,6 +184,8 @@
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Mar 03 2009 - [email protected]
- Renamed SUNWbrasero to SUNWgnome-cd-burner.
* Thu Feb 19 2009 - [email protected]
--- a/SUNWgnome-character-map.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-character-map.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gucharmap
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -26,15 +26,13 @@
BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-doc-utils
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: %{name}-root
%package root
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -91,40 +89,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/metacity.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -174,6 +142,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Fri Sep 12 2008 - [email protected]
- Update copyright
* Tue Jun 17 2008 - [email protected]
--- a/SUNWgnome-commander.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-commander.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-commander
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -35,6 +35,7 @@
Requires: SUNWlibgsf
Requires: SUNWgnome-libs
Requires: SUNWgnome-python-libs
+Requires: SUNWdesktop-cache
%if %build_l10n
%package l10n
@@ -88,16 +89,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+%restart_fmri desktop-mime-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
+%restart_fmri desktop-mime-cache
%files
%doc(bzip2) COPYING ChangeLog
@@ -128,6 +123,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Sep 10 2008 - [email protected]
- Add %doc to %files for copyright
* Fri Aug 22 2008 - [email protected]
--- a/SUNWgnome-config-editor.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-config-editor.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gconf-editor
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -34,13 +34,12 @@
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWgnome-config-devel
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%package root
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
%if %build_l10n
%package l10n
@@ -90,40 +89,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gconf-editor.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%doc -d gconf-editor-%{gceditor.version} README AUTHORS MAINTAINERS
--- a/SUNWgnome-crash-report.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-crash-report.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): bug-buddy
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -37,8 +37,9 @@
Requires: SUNWgnome-panel
Requires: SUNWgnome-config
Requires: SUNWlxml
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWlibgtop
+Requires: %{name}-root
BuildRequires: SUNWgnome-vfs-devel
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWgnome-libs-devel
@@ -53,8 +54,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -123,34 +122,7 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/bug-buddy.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri gconf-cache
%files
%defattr (-, root, bin)
@@ -186,6 +158,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 23 2009 - [email protected]
- Add delivery of 64bit version of libgnomebreakpad.so #6819745
* Thu Sep 11 2008 - [email protected]
--- a/SUNWgnome-desklets-extra.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-desklets-extra.spec Fri Apr 03 12:08:32 2009 +0000
@@ -2,7 +2,7 @@
# spec file for package SUNWgnome-desklets-extra
#
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -25,12 +25,10 @@
Requires: SUNWgnome-desklets
Requires: SUNWgnome-desktop-prefs
Requires: SUNWgnome-libs
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-desktop-prefs-devel
BuildRequires: SUNWgnome-libs-devel
-%description
-
%prep
rm -rf %name-%version
mkdir %name-%version
@@ -50,21 +48,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -73,19 +60,17 @@
%{_datadir}/gdesklets/*
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Jul 16 2008 - [email protected]
- Add rm/mkdir to %prep because build requires that the dir exists.
-
* Tue Jul 15 2008 - [email protected]
- Break gdesklets-extra.spec into three spec files (one for each desklet).
Change this file to use each of the spec files.
-
* Thu Feb 8 2007 - [email protected]
- Update dependency list for files used in %post and during build.
-
* Mon Feb 5 2007 - [email protected]
- Add %prep section to create dir in BUILD dir.
-
* Thu Jan 29 2007 - <[email protected]>
- initial creation
--- a/SUNWgnome-desklets.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-desklets.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gdesklets
#
-# Copyright (c) 2007 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -26,7 +26,7 @@
Requires: SUNWgnome-python-desktop
Requires: SUNWgnome-python-libs
Requires: SUNWgnome-desktop-prefs
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
BuildRequires: SUNWPython-devel
BuildRequires: SUNWgnome-desktop-prefs-devel
BuildRequires: SUNWgnome-libs-devel
@@ -78,14 +78,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include desktop-database-install.script
-%include scrollkeeper-update.script
-%include icon-cache.script
+%restart_fmri desktop-mime-cache icon-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-%include scrollkeeper-update.script
+%restart_fmri desktop-mime-cache
%files
%doc -d gdesklets-%{gdesklets.version} AUTHORS
@@ -118,6 +114,8 @@
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Sep 18 2008 - [email protected]
- Update copyright
* Wed Jun 04 2008 - [email protected]
--- a/SUNWgnome-desktop-prefs.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-desktop-prefs.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): desktop-file-utils, control-center
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -51,7 +51,7 @@
Requires: SUNWlibms
Requires: SUNWlibpopt
Requires: SUNWlxml
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWxwxft
Requires: SUNWbash
%if %with_hal
@@ -87,8 +87,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -175,45 +173,11 @@
%clean
rm -rf $RPM_BUILD_ROOT
-# This package includes update-desktop-database but keeping this postrun
-# script the same as the ones in other packages so that it only runs once
-# for all pkgs (postrun -u option)
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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_gnome_settings_daemon_keybindings.schemas';
- echo ' $SDIR/apps_gnome_settings_daemon_screensaver.schemas';
- echo ' $SDIR/control-center.schemas';
- echo ' $SDIR/apps_gnome_settings_daemon_xrandr.schemas';
- echo ' $SDIR/desktop_gnome_font_rendering.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -338,6 +302,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Mar 05 2009 - [email protected]
- Change SUNWdbus-bindings to SUNWdbus-glib.
* Tue Jan 13 2009 - [email protected]
--- a/SUNWgnome-devel-docs.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-devel-docs.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): GNOME Devel Docs
#
-# Copyright (c) 2005 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -26,7 +26,6 @@
BuildRequires: SUNWgnome-libs
Requires: SUNWgnome-help-viewer
Requires: SUNWgnome-libs
-Requires: SUNWpostrun
%if %build_l10n
%package l10n
@@ -67,17 +66,6 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
%files
%defattr (-, root, bin)
%dir %attr (0755, root, sys) %{_datadir}
@@ -96,11 +84,12 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- stop using postrun
* Tue Mar 17 2009 - [email protected]
- Uncomment %{_datadir}/omf/*/*-[a-z][a-z]_[A-Z]*.omf in %file l10n.
* Mon Sep 10 2007 - Damien Carbery <[email protected]>
- Update dependencies.
-
* Sat Sep 01 2007 - Dave Lin <[email protected]>
- initial version
--- a/SUNWgnome-devhelp.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-devhelp.spec Fri Apr 03 12:08:32 2009 +0000
@@ -1,7 +1,7 @@
#
# spec file for package SUNWdevhelp.spec
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -25,6 +25,8 @@
Requires: SUNWgnome-base-libs
Requires: SUNWgnome-panel
Requires: SUNWfirefox
+Requires: %{name}-root
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-panel-devel
BuildRequires: SUNWfirefox-devel
@@ -33,8 +35,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - developer files
@@ -85,24 +85,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/devhelp.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%post
+%restart_fmri gconf-cache
%files
%defattr (-, root, bin)
--- a/SUNWgnome-dialog.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-dialog.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): zenity
#
-# Copyright 2007 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -24,7 +24,6 @@
%include default-depend.inc
Requires: SUNWgnome-base-libs
Requires: SUNWperl584core
-Requires: SUNWpostrun
Requires: SUNWgnome-panel
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-doc-utils
@@ -74,17 +73,6 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
%files
%doc -d zenity-%{zenity.version} README AUTHORS COPYING THANKS
%doc(bzip2) -d zenity-%{zenity.version} ChangeLog help/ChangeLog po/ChangeLog NEWS
@@ -112,6 +100,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- stop using postrun
* Fri Sep 19 2008 - [email protected]
- Set permissions on /usr/share/doc.
* Wed Sep 10 2008 - [email protected]
--- a/SUNWgnome-display-mgr.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-display-mgr.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gdm
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -52,7 +52,7 @@
Requires: SUNWlibrsvg
Requires: SUNWlxml
Requires: SUNWlibcroco
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%if %option_with_dt
Requires: SUNWgnome-dtlogin-integration
%else
@@ -148,12 +148,7 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%post root
cat >> $BASEDIR/var/svc/profile/upgrade <<\EOF
@@ -179,13 +174,7 @@
EOF
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -286,6 +275,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Apr 01 2009 - [email protected]
- Add the dependency of SUNWswmt for the root package since the customer.conf
uses i.preserve.
--- a/SUNWgnome-doc-utils.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-doc-utils.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gucharmap
#
-# Copyright (c) 2004 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -24,7 +24,6 @@
Requires: SUNWlxml
Requires: SUNWlxsl
Requires: SUNWPython
-Requires: SUNWpostrun
BuildRequires: SUNWlxml-devel
BuildRequires: SUNWlxsl-devel
@@ -68,17 +67,6 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
%files
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_bindir}
@@ -109,6 +97,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- stop using postrun
* Wed Jul 23 2008 - [email protected]
- Modify hack because %{_libdir}/locale is installed on svn_91 but not snv_93.
* Sun Mar 16 2008 - [email protected]
--- a/SUNWgnome-file-mgr.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-file-mgr.spec Fri Apr 03 12:08:32 2009 +0000
@@ -4,7 +4,7 @@
# includes module(s): eel, nautilus, gnome-mount,
# gnome-volume-manager
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -63,7 +63,7 @@
Requires: SUNWzlib
Requires: SUNWlxml
Requires: SUNWzfsr
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%if %with_hal
Requires: SUNWhal
%endif
@@ -72,8 +72,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -149,47 +147,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x %{_bindir}/update-mime-database || exit 0';
- echo '%{_bindir}/update-mime-database %{_datadir}/mime'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+%restart_fmri desktop-mime-cache mime-types-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x %{_bindir}/update-mime-database || exit 0';
- echo '%{_bindir}/update-mime-database %{_datadir}/mime'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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';
-%if %with_hal
- echo 'schemas="$SDIR/apps_nautilus_preferences.schemas';
- echo ' $SDIR/gnome-mount.schemas';
- echo ' $SDIR/gnome-volume-control.schemas"';
-%else
- echo 'schemas="$SDIR/apps_nautilus_preferences.schemas';
- echo ' $SDIR/nautilus-open-terminal.schemas"';
-%endif
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache mime-types-cache
%files
%doc eel-%{eel.version}/AUTHORS eel-%{eel.version}/MAINTAINERS
@@ -276,6 +237,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Mar 19 2009 - [email protected]
- Remove gnome-volume-manager since it is obsolete in GNOME 2.26.
* Tue Feb 10 2009 - [email protected]
--- a/SUNWgnome-games.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-games.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-games, libggz, ggz-client-libs
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -42,8 +42,9 @@
Requires: SUNWgnome-python-desktop
Requires: SUNWlibrsvg
Requires: SUNWPython
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWgnome-media
+Requires: %{name}-root
%if %build_l10n
%package l10n
@@ -57,9 +58,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWgnome-libs
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -146,52 +144,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/blackjack.schemas';
- echo ' $SDIR/glines.schemas';
- echo ' $SDIR/glchess.schemas';
- echo ' $SDIR/gnect.schemas';
- echo ' $SDIR/gnibbles.schemas';
- echo ' $SDIR/gnobots2.schemas';
- echo ' $SDIR/gnomine.schemas';
- echo ' $SDIR/gnotravex.schemas';
- echo ' $SDIR/gnotski.schemas';
- echo ' $SDIR/gtali.schemas';
- echo ' $SDIR/iagno.schemas';
- echo ' $SDIR/same-gnome.schemas';
- echo ' $SDIR/mahjongg.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%doc -d gnome-games-%{gnome_games.version} MAINTAINERS README gnome-sudoku/README dependencies/gnuchess/README same-gnome/README gnotski/README gnomine/README gtali/README glchess/README gnotravex/README COPYING COPYING-DOCS AUTHORS gnome-sudoku/AUTHORS glines/AUTHORS gnotski/AUTHORS gnomine/AUTHORS gnect/AUTHORS gtali/AUTHORS gnobots2/AUTHORS gnotravex/AUTHORS gnibbles/AUTHORS iagno/AUTHORS
@@ -280,6 +236,8 @@
%{_mandir}/man3/*
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Mar 03 2009 - [email protected]
- Remove gnometris again.
* Wed Feb 18 2009 - [email protected]
--- a/SUNWgnome-gui-test.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-gui-test.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): dogtail
#
-# Copyright (c) 2005 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -27,7 +27,7 @@
BuildRequires: SUNWPython-devel
BuildRequires: SUNWPython-extra
BuildRequires: SUNWgnome-a11y-libs-devel
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%prep
rm -rf %name-%version
@@ -48,15 +48,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+%restart_fmri desktop-mime-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -75,6 +70,8 @@
%attr (-, root, other) %{_datadir}/icons
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 23 2009 - [email protected]
- Since /usr/bin/dogtail-recorder (SUNWgnome-gui-test) requires
/usr/lib/python2.4/vendor-packages/gtk-2.0/gtk/keysyms.pyc which is
--- a/SUNWgnome-help-viewer.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-help-viewer.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): yelp
#
-# Copyright 2007 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -34,7 +34,8 @@
Requires: SUNWlibC
Requires: SUNWlibpopt
Requires: SUNWzlib
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
+Requires: %{name}-root
BuildRequires: SUNWgnome-print-devel
BuildRequires: SUNWlibpopt-devel
BuildRequires: SUNWfirefox-devel
@@ -52,8 +53,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -102,37 +101,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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 'retval=0';
- echo 'for schemas in yelp; do' ;
- echo ' $PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $SDIR/$schemas.schemas || retval=1';
- echo 'done';
- echo 'exit $retval'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -164,6 +136,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Sep 11 2008 - [email protected]
- Update copyright
* Fri Jul 18 2008 - [email protected]
--- a/SUNWgnome-hex-editor.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-hex-editor.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): ghex
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -36,7 +36,7 @@
Requires: SUNWgnome-vfs
Requires: SUNWlibms
Requires: SUNWlibpopt
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWgnome-config-devel
@@ -55,8 +55,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -132,34 +130,7 @@
%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
%post
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/ghex2.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri gconf-cache
%clean
rm -rf $RPM_BUILD_ROOT
@@ -227,6 +198,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 30 2009 - [email protected]
- change the owner to yuntong.jin
* Wed Oct 01 2008 - [email protected]
--- a/SUNWgnome-im-client.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-im-client.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): pidgin, pidgin-otr, libotr
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -35,13 +35,14 @@
Requires: SUNWgnutls
Requires: SUNWlibms
Requires: SUNWperl584core
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWgnome-media
Requires: SUNWavahi-bridge-dsd
Requires: SUNWsqlite3
Requires: SUNWpr
Requires: SUNWtls
Requires: SUNWgtkspell
+Requires: %{name}-root
BuildRequires: SUNWPython-devel
BuildRequires: SUNWdbus-devel
BuildRequires: SUNWevolution-data-server-devel
@@ -61,8 +62,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -130,34 +129,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gaim.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -242,6 +217,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Mar 11 2009 - [email protected]
- Change ownership to elaine.
* Fri Aug 01 2008 - [email protected]
--- a/SUNWgnome-img-editor.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-img-editor.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gimp
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -38,7 +38,7 @@
Requires: SUNWlibrsvg
Requires: SUNWpng
Requires: SUNWzlib
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWlcms
Requires: SUNWPython
BuildRequires: SUNWTiff-devel
@@ -111,15 +111,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+%restart_fmri desktop-mime-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -230,6 +225,8 @@
%{_mandir}/*/*
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 23 2009 - [email protected]
- Since /usr/lib/gimp/2.0/plug-ins/colorxhtml.py (SUNWgnome-img-editor)
requires /usr/bin/i86/isapython2.4 which is found in SUNWPython, add
--- a/SUNWgnome-img-organizer.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-img-organizer.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gthumb
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -35,7 +35,7 @@
Requires: SUNWlibexif
Requires: SUNWlibms
Requires: SUNWlibpopt
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWgnome-config-devel
BuildRequires: SUNWgnome-panel-devel
@@ -61,8 +61,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -95,40 +93,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gthumb.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%doc -d gthumb-%{gthumb.version} README AUTHORS
@@ -171,6 +139,8 @@
%{_sysconfdir}/gconf/schemas/gthumb.schemas
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed May 07 2008 - [email protected]
- Remove PERL5LIB setting as it is not necessary.
* Thu Jan 3 2008 - [email protected]
--- a/SUNWgnome-img-viewer.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-img-viewer.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): eog
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -44,7 +44,7 @@
Requires: SUNWlibexif
Requires: SUNWlibms
Requires: SUNWlibpopt
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWlcms
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWgnome-config-devel
@@ -74,8 +74,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -153,40 +151,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/eog.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -255,6 +223,8 @@
%{_includedir}/*
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Web Mar 04 2009 - [email protected]
- Transfer the ownership to bewitche
* Tue Feb 17 2009 - [email protected]
--- a/SUNWgnome-libs.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-libs.spec Fri Apr 03 12:08:32 2009 +0000
@@ -4,7 +4,7 @@
# includes module(s): rarian, startup-notification, libgtkhtml,
# libgnome, libbonoboui, libgnomeui, libexif-gtk
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -45,7 +45,7 @@
Requires: SUNWgnome-component
Requires: SUNWgnome-config
Requires: SUNWlxsl
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWlibC
Requires: SUNWlibtasn1
Requires: SUNWbash
@@ -66,9 +66,8 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
Requires: SUNWgnome-xml-root
-Requires: SUNWgnome-config
+Requires: SUNWpostrun
%package devel
Summary: %{summary} - development files
@@ -169,16 +168,13 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-cache
%post root
( echo 'xmlcatalog --noout --add "rewriteSystem" \' ;
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
-%include gconf-install.script
%preun root
test -x $BASEDIR/var/lib/postrun/postrun || exit 0
@@ -186,36 +182,6 @@
echo '"http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0" \' ;
echo '%{_sysconfdir}/xml/catalog'
) | $BASEDIR/var/lib/postrun/postrun -i -c JDS
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/desktop_gnome_accessibility_keyboard.schemas';
- echo ' $SDIR/desktop_gnome_accessibility_startup.schemas';
- echo ' $SDIR/desktop_gnome_applications_at_visual.schemas';
- echo ' $SDIR/desktop_gnome_applications_at_mobility.schemas';
- echo ' $SDIR/desktop_gnome_applications_browser.schemas';
- echo ' $SDIR/desktop_gnome_applications_office.schemas';
- echo ' $SDIR/desktop_gnome_applications_terminal.schemas';
- echo ' $SDIR/desktop_gnome_applications_window_manager.schemas';
- echo ' $SDIR/desktop_gnome_background.schemas';
- echo ' $SDIR/desktop_gnome_file_views.schemas';
- echo ' $SDIR/desktop_gnome_interface.schemas';
- echo ' $SDIR/desktop_gnome_lockdown.schemas';
- echo ' $SDIR/desktop_gnome_peripherals_keyboard.schemas';
- echo ' $SDIR/desktop_gnome_peripherals_mouse.schemas';
- echo ' $SDIR/desktop_gnome_sound.schemas';
- echo ' $SDIR/desktop_gnome_thumbnailers.schemas';
- echo ' $SDIR/desktop_gnome_thumbnail_cache.schemas';
- echo ' $SDIR/desktop_gnome_typing_break.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
%postun root
rm -rf $BASEDIR/var/lib/scrollkeeper
@@ -373,6 +339,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 23 2009 - [email protected]
- Since /usr/bin/rarian-sk-config (SUNWgnome-libs) requires /usr/bin/bash
which is found in SUNWbash, add the dependency.
--- a/SUNWgnome-media-apps.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-media-apps.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-media
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -40,14 +40,12 @@
Requires: SUNWgnome-vfs
Requires: SUNWgnome-config
Requires: SUNWlibms
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%package root
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -74,14 +72,12 @@
Requires: SUNWgnome-media
Requires: SUNWgnome-media-apps
Requires: SUNWgnome-vfs
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%package -n SUNWgnome-sound-recorder-root
Summary: GNOME sound recording utilities - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -139,68 +135,16 @@
rm -rf $RPM_BUILD_ROOT
%post -n SUNWgnome-sound-recorder
-%include desktop-database-install.script
-%include scrollkeeper-update.script
-%include icon-cache.script
+%restart_fmri desktop-mime-cache icon-cache gconf-cache
%postun -n SUNWgnome-sound-recorder
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-%include scrollkeeper-update.script
-%include icon-cache.script
-
-%post -n SUNWgnome-sound-recorder-root
-%include gconf-install.script
-
-%preun -n SUNWgnome-sound-recorder-root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-sound-recorder.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%post
-%include desktop-database-install.script
-%include scrollkeeper-update.script
-%include icon-cache.script
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache icon-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-%include scrollkeeper-update.script
-%include icon-cache.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-audio-profiles.schemas';
- echo ' $SDIR/gnome-volume-control.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -335,7 +279,11 @@
%dir %attr (0755, root, sys) %{_datadir}
%changelog
-* Uncomment the line "%{_datadir}/omf/*/*-[a-z][a-z]_[A-Z][A-Z].omf" in %file l10n as the file is available in 2.26.0.
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
+* ???
+- Uncomment the line "%{_datadir}/omf/*/*-[a-z][a-z]_[A-Z][A-Z].omf"
+ in %file l10n as the file is available in 2.26.0.
* Fri Sep 26 2008 - [email protected]
- Now that the GPLv3 mixup is fixed, add new copyright files.
* Tue Jun 03 2008 - [email protected]
--- a/SUNWgnome-media-player.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-media-player.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): totem
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -64,7 +64,7 @@
Requires: SUNWlibms
Requires: SUNWlxml
Requires: SUNWgnome-component
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWPython26
Requires: SUNWgnome-python26-libs
Requires: SUNWevolution-libs
@@ -77,13 +77,12 @@
Requires: SUNWlibsoup
Requires: SUNWgst-python26
Requires: SUNWlibsexy
+Requires: %{name}-root
%package root
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
@@ -203,43 +202,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/rhythmbox.schemas';
- echo ' $SDIR/totem-handlers.schemas';
- echo ' $SDIR/totem-video-thumbnail.schemas';
- echo ' $SDIR/totem.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -341,6 +307,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Mar 26 2009 - [email protected]
- move totem-pl-parser out to SUNWtotem-pl-parser
* Fri Feb 27 2009 - [email protected]
--- a/SUNWgnome-media.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-media.spec Fri Apr 03 12:08:32 2009 +0000
@@ -70,6 +70,7 @@
Requires: SUNWxorg-clientlibs
Requires: SUNWzlib
Requires: SUNWlibvisual
+Requires: SUNWdesktop-cache
%if %with_hal
Requires: SUNWhal
%endif
@@ -78,8 +79,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -186,24 +185,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gstreamer-%{gst_minmaj}.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%post
+%restart_fmri gconf-cache
%files
%defattr (-, root, bin)
@@ -274,6 +257,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Fri Feb 20 2009 - [email protected]
- Update packaging as needed for gst-plugins-good 0.10.14.
* Fri Sep 12 2008 - [email protected]
--- a/SUNWgnome-meeting.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-meeting.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): ptlib, opal, ekiga
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -44,7 +44,7 @@
Requires: SUNWgnutls
Requires: SUNWgnome-config
Requires: SUNWgnome-meeting-root
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWevolution-data-server
Requires: SUNWgnome-audio
Requires: SUNWavahi-bridge-dsd
@@ -63,8 +63,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -139,32 +137,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include desktop-database-install.script
-%include scrollkeeper-update.script
-%include icon-cache.script
+%restart_fmri desktop-mime-cache icon-cache gconf-cache
%postun
-%include desktop-database-uninstall.script
-%include scrollkeeper-update.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/ekiga.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%doc(bzip2) -d %{base_arch} ptlib-%{ptlib.version}/mpl-1.0.htm
@@ -253,6 +229,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Feb 23 2009 - [email protected]
- Remove SSE2 support to fix bugster#6808201. Because there is no
significant performance impact brought by SSE2 support since 3.0.
--- a/SUNWgnome-menu-editor.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-menu-editor.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): alacarte
#
-# Copyright 2007 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -23,7 +23,7 @@
Requires: SUNWgnome-libs
Requires: SUNWgnome-panel
Requires: SUNWgnome-python-libs
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWPython
BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWgnome-python-libs-devel
@@ -67,7 +67,7 @@
rm -rf ${RPM_BUILD_ROOT}DISABLE
%post
-%include icon-cache.script
+%restart_fmri icon-cache
%files
%doc -d alacarte-%{alacarte.version} AUTHORS
@@ -94,6 +94,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Fri Sep 19 2008 - [email protected]
- Set permissions on /usr/share/doc.
* Tue Sep 16 2008 - [email protected]
--- a/SUNWgnome-nettool.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-nettool.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-nettool
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -24,6 +24,7 @@
Requires: SUNWgnome-base-libs
Requires: SUNWgnome-libs
Requires: SUNWgnome-config
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-config-devel
%if %build_l10n
@@ -68,22 +69,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
+%restart_fmri desktop-mime-cache
%files
%doc -d gnome-nettool-%{nettool.version} README AUTHORS
@@ -143,6 +132,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Sep 23 2008 - [email protected]
- Change attribute conflict with SUNWgnome-l10n*
%{_datadir}/gnome/help/%{nettool.name}
--- a/SUNWgnome-panel.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-panel.spec Fri Apr 03 12:08:32 2009 +0000
@@ -4,7 +4,7 @@
# includes module(s): libwnck, libnotify, notification-daemon, libgweather,
# gnome-desktop, gnome-menus, gnome-panel
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -59,7 +59,7 @@
Requires: SUNWlibms
Requires: SUNWlibrsvg
Requires: SUNWpng
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWevolution-data-server
Requires: SUNWiso-codes
Requires: SUNWdbus
@@ -77,8 +77,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -188,54 +186,7 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $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';
- echo '}';
- echo 'umask 0022';
- echo "GCONF_CONFIG_SOURCE=xml:merged:%{_sysconfdir}/gconf/gconf.xml.defaults";
- echo 'export GCONF_CONFIG_SOURCE';
- echo "SDIR=%{_sysconfdir}/gconf/schemas";
- echo 'retval=0';
- 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'
-) | $BASEDIR/var/lib/postrun/postrun -c JDS_wait
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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 'retval=0';
- 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 > /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';
- echo 'exit $retval'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri gconf-cache
%files
%defattr (-, root, bin)
@@ -397,6 +348,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 23 2009 - [email protected]
- Since /usr/bin/gmenu-simple-editor (SUNWgnome-panel) requires
/usr/bin/i86/isapython2.4 which is found in SUNWPython, and
--- a/SUNWgnome-pdf-viewer.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-pdf-viewer.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): poppler, poppler-data, evince
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -57,7 +57,7 @@
Requires: SUNWlibpopt
Requires: SUNWlxml
Requires: SUNWzlib
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%package devel
Summary: %{summary} - development files
@@ -78,8 +78,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -148,42 +146,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/evince.schemas';
- echo ' $SDIR/evince-thumbnailer-ps.schemas';
- echo ' $SDIR/evince-thumbnailer.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -252,6 +218,8 @@
%{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Sep 15 2008 - [email protected]
- Update copyright
* Fri Aug 15 2008 - [email protected]
--- a/SUNWgnome-pilot.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-pilot.spec Fri Apr 03 12:08:32 2009 +0000
@@ -40,7 +40,7 @@
Requires: SUNWgnome-component
Requires: SUNWgnome-config
Requires: SUNWgnome-vfs
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWpilot-link
BuildRequires: SUNWgnome-panel-devel
BuildRequires: SUNWgnome-base-libs-devel
@@ -67,8 +67,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -113,40 +111,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/pilot.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -200,6 +168,8 @@
%{_sysconfdir}/gconf/schemas/pilot.schemas
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Sep 17 2008 - [email protected]
- Add copyright related files per new process.
* Thu May 22 2008 - [email protected]
--- a/SUNWgnome-power-manager.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-power-manager.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-power-manager
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -35,15 +35,14 @@
BuildRequires: SUNWgnome-panel-devel
Requires: SUNWgnome-media
BuildRequires: SUNWgnome-media-devel
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
+Requires: %{name}-root
Requires: SUNWxdg-utils
%package root
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -97,34 +96,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include icon-cache.script
-%include desktop-database-install.script
-%include scrollkeeper-update.script
+%restart_fmri desktop-mime-cache icon-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-%include scrollkeeper-update.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-power-manager.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
-
+%restart_fmri desktop-mime-cache
%files
%doc -d gnome-power-manager-%{gpm.version} README AUTHORS
@@ -183,6 +158,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Mar 05 2009 - [email protected]
- Change SUNWdbus-bindings to SUNWdbus-glib.
* Thu Feb 19 2009 - [email protected]
--- a/SUNWgnome-print.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-print.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): libgnomeprint, libgnomeprintui
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -52,7 +52,7 @@
Requires: SUNWlibms
Requires: SUNWlibpopt
Requires: SUNWpapi
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWgnome-config-devel
@@ -66,8 +66,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -191,41 +189,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-print-manager.schemas';
- echo ' $SDIR/gnome-print.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%doc libgnomeprint-%{gprint.version}/AUTHORS
@@ -303,6 +270,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Jun 24 2008 - [email protected]
- Remove "-lgailutil" from LDFLAGS. Root cause found in gtk+: bugzilla 536430.
* Wed Jun 04 2008 - [email protected]
--- a/SUNWgnome-remote-desktop.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-remote-desktop.spec Fri Apr 03 12:08:32 2009 +0000
@@ -34,10 +34,11 @@
Requires: SUNWjpg
Requires: SUNWlibgcrypt
Requires: SUNWzlib
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWgnome-panel
Requires: SUNWavahi-bridge-dsd
Requires: SUNWlibunique
+Requires: %{name}-root
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWgnome-config-devel
BuildRequires: SUNWgnutls-devel
@@ -61,8 +62,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -113,31 +112,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include desktop-database-install.script
-%include icon-cache.script
+%restart_fmri desktop-mime-cache icon-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/vino-server.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%doc vino-%{vino.version}/AUTHORS
@@ -176,6 +154,8 @@
%{_sysconfdir}/xdg/autostart/vino-server.desktop
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Sat Jan 24 2009 - [email protected]
- Update %files, move autostart/vino-server.desktop to -root pkg.
* Sat Jan 24 2009 - [email protected]
--- a/SUNWgnome-session.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-session.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-session
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -35,7 +35,7 @@
Requires: SUNWlxml
Requires: SUNWgnome-audio
Requires: SUNWgnome-base-libs
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWgnome-desktop-prefs
Requires: SUNWgnome-wm
BuildRequires: SUNWgnome-audio-devel
@@ -51,8 +51,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
%package l10n
@@ -98,35 +96,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-session.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
-
+%restart_fmri desktop-mime-cache
%files
%doc -d gnome-session-%{gsession.version} README AUTHORS
@@ -188,6 +161,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Feb 11 2009 - [email protected]
- Add /usr/lib/compiz-by-default to %files section
* Mon Sep 08 2008 - [email protected]
--- a/SUNWgnome-system-monitor.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-system-monitor.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-system-monitor
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -30,7 +30,8 @@
Requires: SUNWgnome-panel
Requires: SUNWperl-xml-parser
Requires: SUNWlibC
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
+Requires: %{name}-root
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWgnome-themes-devel
@@ -54,8 +55,6 @@
Summary: GNOME system monitor - platform dependent, / file system
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -101,40 +100,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-system-monitor.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%doc -d gnome-system-monitor-%{gnomesystemmonitor.version} README AUTHORS
@@ -178,6 +147,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Mar 24 2009 - [email protected]
- Add BuildRequires of SUNWglibmm-devel SUNWgtkmm-devel.
* Mon Mar 23 2009 - Niall Power <[email protected]>
--- a/SUNWgnome-system-tools.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-system-tools.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-system-tools, system-tools-backends
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -33,6 +33,8 @@
Requires: SUNWperl584core
Requires: SUNWperl-authen-pam
Requires: SUNWgksu
+Requires: SUNWdesktop-cache
+Requires: %{name}-root
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-file-mgr-devel
BuildRequires: SUNWgnome-libs-devel
@@ -61,8 +63,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -136,24 +136,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-system-tools.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%post
+%restart_fmri gconf-cache
%files
%defattr (-, root, bin)
@@ -228,6 +212,8 @@
%config %class(rbac) %attr (0644, root, sys) %{_sysconfdir}/security/exec_attr
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Fri Sep 12 2008 - [email protected]
- Update copyright
* Wed Jul 9 2008 - [email protected]
--- a/SUNWgnome-terminal.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-terminal.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): vte gnome-terminal
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -39,7 +39,8 @@
Requires: SUNWlibms
Requires: SUNWlibpopt
Requires: SUNWxwxft
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
+Requires: %{name}-root
BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-config-devel
@@ -63,8 +64,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -120,40 +119,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-terminal.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -226,6 +195,8 @@
%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Mar 18 2009 - [email protected]
- Add BuildRequires: SUNWgtk-doc
* Tue Jan 20 2009 - [email protected]
--- a/SUNWgnome-text-editor.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-text-editor.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gedit gtksourceview
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -35,7 +35,7 @@
Requires: SUNWPython
Requires: SUNWgnome-python-libs
Requires: SUNWgnome-python-desktop
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWgnome-gtksourceview
Requires: SUNWgnome-spell
BuildRequires: SUNWxwinc
@@ -64,8 +64,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -117,40 +115,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gedit.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -204,6 +172,8 @@
%{_includedir}/*
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 30 2009 - [email protected]
- change the owner to yuntong.jin
* Fri Dec 26 2008 - [email protected]
--- a/SUNWgnome-themes.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-themes.spec Fri Apr 03 12:08:32 2009 +0000
@@ -4,7 +4,7 @@
# includes module(s): hicolor-icon-theme, gnome-themes, gtk2-engines,
# blueprint, nimbus, sun-gdm-themes, gnome-icon-theme
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -63,7 +63,7 @@
Requires: SUNWpng
Requires: SUNWTiff
Requires: SUNWjpg
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWbash
BuildRequires: SUNWimagick
BuildRequires: SUNWperl-xml-parser
@@ -419,9 +419,11 @@
find $BASEDIR/share/icons -name icon-theme.cache -exec /bin/rm -f {} \;
%post
-%include icon-cache.script
+%restart_fmri icon-cache
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Mar 24 2009 - [email protected]
- Since /usr/lib/amd64/pkgconfig/gtk-engines-2.pc requires /usr/lib/amd64
/pkgconfig/gtk+-2.0.pc, add the dependency of SUNWgnome-base-libs-devel
--- a/SUNWgnome-ui-designer.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-ui-designer.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): glade
#
-# Copyright (c) 2004 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -28,7 +28,7 @@
Requires: SUNWlibms
Requires: SUNWlibpopt
Requires: SUNWlxml
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWlibpopt-devel
BuildRequires: SUNWgnome-libs-devel
@@ -84,21 +84,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%files
%defattr (-, root, bin)
@@ -141,6 +130,8 @@
%{_datadir}/gtk-doc
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Jan 29 2008 - [email protected]
- Remove without_gtk_doc validation. gtk-doc
should always be packaged.
--- a/SUNWgnome-user-docs.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-user-docs.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-user-docs
#
-# Copyright (c) 2004 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -22,7 +22,6 @@
%include default-depend.inc
BuildRequires: SUNWlxml-python
Requires: SUNWgnome-help-viewer
-Requires: SUNWpostrun
%if %build_l10n
%package l10n
@@ -64,17 +63,6 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
%files
%defattr (-, root, bin)
%doc -d gnome-user-docs-%{gud.version} README AUTHORS
@@ -98,6 +86,8 @@
%changelog
+* Fri Apr 3 2009 - [email protected]
+- stop using postrun
* Wed Mar 11 2009 - [email protected]
- Took the ownership of this spec file.
* Fri Sep 19 2008 - [email protected]
--- a/SUNWgnome-utils.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-utils.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-utils
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -47,15 +47,13 @@
Requires: SUNWgnome-libs
Requires: SUNWgnome-panel
Requires: SUNWgnome-vfs
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWxcu4
%package -n SUNWgnome-search-tool-root
Summary: GNOME file search tool - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWgnome-config
-Requires: SUNWpostrun-root
%package -n SUNWgnome-dictionary
Summary: GNOME dictionary tool
@@ -68,14 +66,11 @@
Requires: SUNWgnome-base-libs
Requires: SUNWgnome-config
Requires: SUNWlibms
-Requires: SUNWpostrun
%package -n SUNWgnome-dictionary-root
Summary: GNOME dictionary tool - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package -n SUNWgnome-screenshot
Summary: GNOME screenshot tool
@@ -87,13 +82,12 @@
Requires: SUNWgnome-libs
Requires: SUNWgnome-vfs
Requires: SUNWlibms
+Requires: SUNWdesktop-cache
%package -n SUNWgnome-screenshot-root
Summary: GNOME screenshot tool - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package -n SUNWgnome-log-viewer
Summary: GNOME log viewer
@@ -105,7 +99,7 @@
Requires: SUNWgnome-libs
Requires: SUNWgnome-panel
Requires: SUNWgnome-vfs
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWlibms
%package -n SUNWgnome-log-viewer-devel
@@ -118,15 +112,13 @@
Requires: SUNWgnome-libs
Requires: SUNWgnome-panel
Requires: SUNWgnome-vfs
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWlibms
%package -n SUNWgnome-log-viewer-root
Summary: GNOME log viewer - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package -n SUNWgnome-disk-analyzer
Summary: GNOME disk usage analyzer
@@ -137,12 +129,13 @@
Requires: SUNWgnome-libs
Requires: SUNWgnome-vfs
Requires: SUNWlibgtop
+Requires: SUNWgnome-disk-analyzer-root
+Requires: SUNWdesktop-cache
%package -n SUNWgnome-disk-analyzer-root
Summary: GNOME disk usage analyzer - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
%if %build_l10n
%package l10n
@@ -231,176 +224,34 @@
rm -rf $RPM_BUILD_ROOT
%post -n SUNWgnome-disk-analyzer
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
+
+%postun -n SUNWgnome-disk-analyzer
+%restart_fmri desktop-mime-cache
%post -n SUNWgnome-log-viewer
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun -n SUNWgnome-log-viewer
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%post -n SUNWgnome-search-tool
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun -n SUNWgnome-search-tool
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%post -n SUNWgnome-dictionary
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun -n SUNWgnome-dictionary
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
%post -n SUNWgnome-screenshot
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun -n SUNWgnome-screenshot
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
- echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post -n SUNWgnome-disk-analyzer-root
-%include gconf-install.script
-
-%preun -n SUNWgnome-disk-analyzer-root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/baobab.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
-
-%post -n SUNWgnome-log-viewer-root
-%include gconf-install.script
-
-%preun -n SUNWgnome-log-viewer-root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/logview.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
-
-%post -n SUNWgnome-search-tool-root
-%include gconf-install.script
-
-%preun -n SUNWgnome-search-tool-root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-search-tool.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
-
-%post -n SUNWgnome-dictionary-root
-%include gconf-install.script
-
-%preun -n SUNWgnome-dictionary-root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-dictionary.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
-
-%post -n SUNWgnome-screenshot-root
-%include gconf-install.script
-
-%preun -n SUNWgnome-screenshot-root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gnome-screenshot.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
-
+%restart_fmri desktop-mime-cache
%files -n SUNWgnome-log-viewer
%defattr (-, root, bin)
@@ -549,6 +400,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Thu Feb 26 2009 - [email protected]
- Move logview manpage installation to basic spec.
* Wed Sep 24 2008 - [email protected]
--- a/SUNWgnome-vfs.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-vfs.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-mime-data, gnome-vfs
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -37,7 +37,7 @@
Requires: SUNWzlib
Requires: SUNWlxml
Requires: SUNWsmbau
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWlibms
Requires: SUNWopenssl-libraries
Requires: SUNWgamin
@@ -58,8 +58,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -122,35 +120,7 @@
rm -rf $RPM_BUILD_ROOT
%post
-# even though this package includes /usr/bin/update-desktop-database
-# so we know it's always there, keep the postrun commands the same
-# for this and -share so that postrun will only run it once (-u option)
-( echo 'test -x %{_bindir}/update-mime-database || exit 0';
- echo '%{_bindir}/update-mime-database %{_datadir}/mime'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/desktop_default_applications.schemas';
- echo ' $SDIR/desktop_gnome_url_handlers.schemas';
- echo ' $SDIR/system_dns_sd.schemas';
- echo ' $SDIR/system_http_proxy.schemas';
- echo ' $SDIR/system_smb.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri mime-types-cache gconf-cache
%files
%doc -d shared-mime-info-%{smimeinfo.version} README
@@ -223,6 +193,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 23 2009 - [email protected]
- Add the dependency on SUNWless since /usr/bin/gvfs-less calls usr/bin/less
* Thu Mar 05 2009 - [email protected]
--- a/SUNWgnome-wm.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWgnome-wm.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): metacity
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -31,18 +31,17 @@
Requires: SUNWgnome-libs
Requires: SUNWgnome-base-libs
Requires: SUNWgnome-config
+Requires: SUNWpostrun
Requires: SUNWbzip
Requires: SUNWzlib
Requires: SUNWlxml
Requires: SUNWlibms
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
%package root
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -99,19 +98,7 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-
-%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
+%restart_fmri desktop-mime-cache gconf-cache
%ifarch sparc
( echo 'test -x /usr/bin/gconftool-2 || {';
echo ' echo "ERROR: gconftool-2 not found"';
@@ -122,24 +109,11 @@
echo 'export GCONF_CONFIG_SOURCE';
echo "SDIR=%{_sysconfdir}/gconf/schemas";
echo '/usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE -t bool -s /apps/metacity/general/reduced_resources true'
-) | $BASEDIR/var/lib/postrun/postrun -c JDS_wait
+) | $BASEDIR/lib/postrun -c JDS
%endif
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/metacity.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%postun
+%restart_fmri desktop-mime-cache
%files
%doc -d metacity-%{metacity.version} README AUTHORS MAINTAINERS
@@ -187,6 +161,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Feb 18 2009 - [email protected]
- Add BuildRequires: SUNWgnome-dialog as it requires zenity.
* Fri Dec 12 2008 - [email protected]
--- a/SUNWhamster.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWhamster.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): hamster
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -35,6 +35,8 @@
Requires: SUNWpysqlite
Requires: SUNWPython
Requires: SUNWgnome-python-desktop
+Requires: %{name}-root
+Requires: SUNWdesktop-cache
%if %build_l10n
%package l10n
@@ -48,8 +50,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
%setup -q -n hamster-applet-%{version}
@@ -90,24 +90,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
- echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
- echo 'SDIR=$BASEDIR/etc/gconf/schemas';
- echo 'schemas="$SDIR/hamster-applet.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%post
+%restart_fmri gconf-cache
%files
%defattr (-, root, bin)
@@ -142,6 +126,8 @@
%{_sysconfdir}/gconf/schemas/hamster-applet.schemas
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Mar 17 2009 - [email protected]
- Bump to 2.26.0
* Thu Mar 05 2009 - [email protected]
--- a/SUNWlibcanberra.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWlibcanberra.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): libcanberra
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -34,6 +34,7 @@
Requires: SUNWgnome-media
Requires: SUNWogg-vorbis
Requires: SUNWltdl
+Requires: SUNWdesktop-cache
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-media-devel
BuildRequires: SUNWogg-vorbis-devel
@@ -42,7 +43,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
%package devel
Summary: %{summary} - development files
@@ -101,24 +101,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/libcanberra.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%post
+%restart_fmri desktop-cache
%files
%defattr (-, root, bin)
@@ -160,6 +144,8 @@
%dir %attr (0755, root, other) %{_datadir}/gnome
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Feb 10 2009 - [email protected]
- Add Requires: SUNWltdl to fix issue #5 for CR6753371
* Wed Jan 21 2009 - [email protected]
--- a/SUNWlibgsf.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWlibgsf.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): libgsf
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -38,6 +38,7 @@
Requires: SUNWzlib
Requires: SUNWlibms
Requires: SUNWgnome-python-libs
+Requires: SUNWdesktop-cache
BuildRequires: SUNWlibm
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-component-devel
@@ -50,7 +51,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun
%package devel
Summary: %{summary} - development files
@@ -131,24 +131,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/gsf-office-thumbnailer.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%post
+%restart_fmri gconf-cache
%files
%defattr (-, root, bin)
@@ -198,6 +182,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 24 2009 - [email protected]
- Since /usr/lib/amd64/pkgconfig/libgsf-1.pc (SUNWlibgsf-devel) requires
/usr/lib/amd64/pkgconfig/glib-2.0.pc which is found in
--- a/SUNWlibrsvg.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWlibrsvg.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): librsvg
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -44,7 +44,7 @@
Requires: SUNWlibms
Requires: SUNWlibpopt
Requires: SUNWlxml
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWPython
# SFEgeckosdk provides /usr/bin/mozilla-config but not the required headers.
# SUNWfirefox-devel provides /usr/bin/firefox-config and the header files.
@@ -105,35 +105,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -d %{_sysconfdir}/gtk-2.0 || exit 0';
- echo 'test -x %{_bindir}/gdk-pixbuf-query-loaders || exit 0';
- echo '%{_bindir}/gdk-pixbuf-query-loaders \';
- echo ' > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders' ) | \
- $BASEDIR/lib/postrun -u -c JDS_wait
-%ifarch amd64 sparcv9
-( echo "/bin/isainfo | /bin/egrep -s '(amd64|sparcv9)' || exit 0";
- echo 'test -d %{_sysconfdir}/%{_arch64}/gtk-2.0 || exit 0';
- echo 'test -x %{_bindir}/%{_arch64}/gdk-pixbuf-query-loaders || exit 0';
- echo '%{_bindir}/%{_arch64}/gdk-pixbuf-query-loaders \';
- echo ' > %{_sysconfdir}/%{_arch64}/gtk-2.0/gdk-pixbuf.loaders' ) | \
- $BASEDIR/lib/postrun -u -c JDS
-%endif
+%restart_fmri pixbuf-loaders-installer
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -d %{_sysconfdir}/gtk-2.0 || exit 0';
- echo 'test -x %{_bindir}/gdk-pixbuf-query-loaders || exit 0';
- echo '%{_bindir}/gdk-pixbuf-query-loaders \';
- echo ' > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders' ) | \
- $BASEDIR/lib/postrun -u -c JDS
-%ifarch amd64 sparcv9
-( echo "/bin/isainfo | /bin/egrep -s '(amd64|sparcv9)' || exit 0";
- echo 'test -d %{_sysconfdir}/%{_arch64}/gtk-2.0 || exit 0';
- echo 'test -x %{_bindir}/%{_arch64}/gdk-pixbuf-query-loaders || exit 0';
- echo '%{_bindir}/%{_arch64}/gdk-pixbuf-query-loaders \';
- echo ' > %{_sysconfdir}/%{_arch64}/gtk-2.0/gdk-pixbuf.loaders' ) | \
- $BASEDIR/lib/postrun -u -c JDS
-%endif
+%restart_fmri pixbuf-loaders-installer
%files
%doc(bzip2) -d %{base_arch}/librsvg-%{version} COPYING COPYING.LIB ChangeLog NEWS
@@ -177,6 +152,8 @@
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Mar 24 2009 - [email protected]
- Since /usr/lib/amd64/pkgconfig/librsvg-2.0.pc (SUNWlibrsvg-devel) requires
/usr/lib/amd64/pkgconfig/glib-2.0.pc which is found in
--- a/SUNWnwam-manager.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWnwam-manager.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): nwam-manager
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -32,6 +32,7 @@
Requires: SUNWgnome-base-libs
Requires: SUNWgnome-session
Requires: SUNWcslr
+Requires: SUNWdesktop-cache
%package root
Summary: %{summary} - / filesystem
@@ -77,29 +78,7 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include icon-cache.script
-
-%post root
-
-%include gconf-install.script
-
-%preun root
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/nwam-manager.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri icon-cache gconf-cache
%files
%defattr (-, root, bin)
@@ -153,6 +132,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Sep 15 2008 - [email protected]
- Update copyright (thanks to Matt for the changes).
* Mon Sep 8 2008 - [email protected]
--- a/SUNWprint-monitor.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWprint-monitor.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): ospm
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -28,8 +28,9 @@
Requires: SUNWgnome-component
Requires: SUNWgnome-config
Requires: SUNWzlib
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWgnome-panel
+Requires: %{name}-root
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWgnome-config-devel
BuildRequires: SUNWgnome-libs-devel
@@ -50,8 +51,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%prep
rm -rf %name-%version
@@ -103,30 +102,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include desktop-database-install.script
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/ospm.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%doc(bzip2) -d ospm-%{ospm.version} COPYING ChangeLog po/ChangeLog
@@ -167,6 +146,8 @@
%config %class(rbac) %attr (0644, root, sys) %{_sysconfdir}/security/exec_attr
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Dec 03 2008 - [email protected]
- Added BuildRequires of SUNWgnome-xml-root and SUNWgnome-xml-share
* Thu Nov 20 2008 - [email protected]
--- a/SUNWseahorse.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWseahorse.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): seahorse
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -28,11 +28,12 @@
Requires: SUNWgnome-panel
Requires: SUNWgnome-desktop-prefs
Requires: SUNWsshcu
+Requires: SUNWdesktop-cache
+Requires: %{name}-root
BuildRequires: SUNWgnome-config-devel
BuildRequires: SUNWgnome-libs
BuildRequires: SUNWgnome-panel-devel
BuildRequires: SUNWgnome-doc-utils
-Requires: SUNWpostrun
%if %build_l10n
%package l10n
@@ -46,8 +47,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%package devel
Summary: %{summary} - development files
@@ -95,40 +94,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/rarian-sk-update || exit 0';
- echo '/usr/bin/rarian-sk-keeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/rarian-sk-update || exit 0';
- echo '/usr/bin/rarian-sk-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( 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:$PKG_INSTALL_ROOT/etc/gconf/gconf.xml.defaults';
- echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
- echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
- echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
- echo 'SDIR=$PKG_INSTALL_ROOT%{_sysconfdir}/gconf/schemas';
- echo 'schemas="$SDIR/gnome-keyring-manager.schemas"';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+%restart_fmri desktop-mime-cache
%files
%doc -d seahorse-%{seahorse.version} AUTHORS README
@@ -209,6 +178,8 @@
%{_sysconfdir}/xdg/autostart/*.desktop
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Feb 04 2008 - [email protected]
- Not ship /usr/share/cryptui/ui/*.ui
- Move seahorse-daemon.desktop to /etc/xdg/autostart
--- a/SUNWthunderbird.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWthunderbird.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): thunderbird
#
-# Copyright 2007 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -47,7 +47,7 @@
Requires: SUNWgnome-vfs
Requires: SUNWlibC
Requires: SUNWlibms
-Requires: SUNWpostrun
+Requires: SUNWdesktop-cache
Requires: SUNWpr
Requires: SUNWtls
Requires: SUNWbash
@@ -130,15 +130,10 @@
#########################################
%post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+%restart_fmri desktop-mime-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
- echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%restart_fmri desktop-mime-cache
#####################################
## Package Files Section ##
@@ -173,6 +168,8 @@
%endif
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Mon Mar 23 2009 - [email protected]
- Since /usr/lib/thunderbird/thunderbird (SUNWthunderbird) requires
/usr/bin/bash which is found in SUNWbash, add the dependency.
@@ -203,23 +200,17 @@
- update postrun scripts
* Tue Jun 20 2006 - [email protected]
- Add SUNWpr and SUNWtls dependencies after check-deps.pl run.
-
* Mon Jun 12 2006 - [email protected]
- changed to let thunderbird use nss,nspr in /usr/lib/mps required by ARC
- remove -R%{_libdir}
-
* Sun Jun 11 2006 - [email protected]
- change group from other to bin/sys
-
* Fri Jun 09 2006 - [email protected]
- Uncomment man page lines in %files.
-
* Thu Jun 08 2006 - [email protected]
- add man page prepared by Leon Sha
-
* Fri May 12 2006 - [email protected]
- Small update to dependency list after check-deps.pl run.
-
* Thu Apr 27 2006 - [email protected]
- remove the devel pkg since the it's almost the same as firefox's devel pkg
- set -R%{_libdir}/firefox to let thunderbird use the nss,nspr libs delivered
@@ -228,27 +219,19 @@
- changed pkg category to "THUNDERBIRD" to make it more clear
* Thu Apr 13 2006 - [email protected]
- changed the installation location from "/usr/sfw/lib" to "/usr/lib"
-
* Mon Feb 20 2006 - [email protected]
- Update Build/Requires after running check-deps.pl script.
-
* Thu Jan 18 2006 - [email protected]
- add "-lXft -lfontconfig -lfreetype" to support configure opt "enable-static"
-
* Sat Dec 3 2005 - [email protected]
- add %post script that runs update-desktop-database
-
* Mon Oct 31 2005 - [email protected]
- merge -share pkgs into base
-
* Mon Sep 26 2005 - [email protected]
- Change version same with linux verion.
-
* Thu Sep 22 2005 - [email protected]
- add %{_libdir} to %files so that we actually package thunderbird...
-
* Fri Sep 02 2005 - [email protected]
- Fix %files.
-
* Fri Aug 26 2005 - [email protected]
- initial version of the spec file created
--- a/SUNWvinagre.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWvinagre.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): vinagre
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -41,6 +41,8 @@
Requires: SUNWxorg-clientlibs
Requires: SUNWxwice
Requires: SUNWxwplt
+Requires: SUNWdesktop-cache
+Requires: %{name}-root
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWgnutls-devel
@@ -66,7 +68,6 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
%prep
rm -rf %name-%version
@@ -108,31 +109,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-%include desktop-database-install.script
-%include icon-cache.script
+%restart_fmri desktop-mime-cache icon-cache gconf-cache
%postun
-test -x $BASEDIR/lib/postrun || exit 0
-%include desktop-database-uninstall.script
-
-%post root
-%include gconf-install.script
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/vinagre.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
+%restart_fmri desktop-mime-cache
%files
%doc -d vinagre-%{vinagre.version} README AUTHORS
@@ -188,6 +168,8 @@
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Tue Jan 06 2009 - [email protected]
- Change %files to reflect version bumping
* Tue Dec 23 2008 - [email protected]
--- a/SUNWvirt-manager.spec Fri Apr 03 10:46:38 2009 +0000
+++ b/SUNWvirt-manager.spec Fri Apr 03 12:08:32 2009 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): virt-manager
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -30,14 +30,14 @@
Requires: SUNWlibvirt
Requires: SUNWvirtinst
Requires: SUNWurlgrabber
+Requires: SUNWdesktop-cache
+Requires: %{name}-root
BuildRequires: SUNWgnome-python-libs-devel
%package root
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun-root
-Requires: SUNWgnome-config
%if %build_l10n
@@ -84,26 +84,8 @@
rm -rf $RPM_BUILD_ROOT
-%post root
-%include gconf-install.script
-
-
-%preun root
-test -x $BASEDIR/var/lib/postrun/postrun || exit 0
-( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
- echo ' echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
- echo ' exit 0';
- echo '}';
- 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 '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/virt-manager.schemas';
- echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
-
+%post
+%restart_fmri gconf-cache
%files
%doc -d virt-manager-%{virtmanager.version} README AUTHORS
@@ -153,6 +135,8 @@
%changelog
+* Fri Apr 3 2009 - [email protected]
+- use desktop-cache instead of postrun
* Wed Sep 17 2008 - Henry Zhang <[email protected]>
- Add %doc to %files for copyright
* Mon Apr 14 2008 - [email protected]
--- a/include/prod.inc Fri Apr 03 10:46:38 2009 +0000
+++ b/include/prod.inc Fri Apr 03 12:08:32 2009 +0000
@@ -1,7 +1,7 @@
#
# Default settings for GNOME packages on Solaris
#
-# Copyright 2007 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
#
SUNW_ProdName: GNOME
SUNW_ProdVers: 2.26.0
@@ -18,7 +18,11 @@
%define pkg_prefix SUNW
+%define restart_fmri $BASEDIR/share/desktop-cache/restart_fmri
+
# ChangeLog:
+# 2009-04-03 Laszlo (Laca) Peter <[email protected]>
+# - define restart_fmri
# 2007-09-27 Laszlo (Laca) Peter <[email protected]>
# - move tjds build option to options.inc
# 2007-03-15 Laszlo (Laca) Peter <[email protected]>