From a1e13b54625bc2f1fc8c3feaa3fe27f8812c0963 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Jan 15 2008 00:31:49 +0000 Subject: fix scriptlets --- diff --git a/gnome-keyring.spec b/gnome-keyring.spec index cf534d2..ade9636 100644 --- a/gnome-keyring.spec +++ b/gnome-keyring.spec @@ -26,6 +26,10 @@ BuildRequires: autoconf, automake, libtool BuildRequires: gettext BuildRequires: intltool BuildRequires: perl(XML::Parser) +Requires(pre): GConf2 +Requires(preun): GConf2 +Requires(post): GConf2 + %description gnome-keyring manages passwords and other types of secrets @@ -74,7 +78,9 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install install-pam DESTDIR=$RPM_BUILD_ROOT +unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL rm $RPM_BUILD_ROOT/%{_lib}/security/*.la rm $RPM_BUILD_ROOT%{_libdir}/*.la @@ -85,7 +91,23 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/*.la %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-keyring.schemas > /dev/null || : + +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-keyring.schemas > /dev/null || : +fi + +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-keyring.schemas > /dev/null || : +fi + %postun -p /sbin/ldconfig %files -f gnome-keyring.lang @@ -99,6 +121,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_libexecdir}/* %{_datadir}/dbus-1/services/org.gnome.keyring.service +%{_sysconfdir}/gconf/schemas/gnome-keyring.schemas %files devel %defattr(-, root, root)