rpms/gnome-keyring/devel gnome-keyring.spec,1.73,1.74

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26313

Modified Files:
	gnome-keyring.spec 
Log Message:
fix scriptlets



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gnome-keyring.spec	15 Jan 2008 00:17:12 -0000	1.73
+++ gnome-keyring.spec	15 Jan 2008 00:31:49 -0000	1.74
@@ -26,6 +26,10 @@
 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 @@
 
 %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 @@
 %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 @@
 %{_bindir}/*
 %{_libexecdir}/*
 %{_datadir}/dbus-1/services/org.gnome.keyring.service
+%{_sysconfdir}/gconf/schemas/gnome-keyring.schemas
 
 %files devel
 %defattr(-, root, root)