--- 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]