rpms/deskbar-applet/devel deskbar-applet.spec,1.17,1.18

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16840

Modified Files:
	deskbar-applet.spec 
Log Message:
Correct quick fix


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- deskbar-applet.spec	17 Feb 2006 07:04:04 -0000	1.17
+++ deskbar-applet.spec	17 Feb 2006 07:07:49 -0000	1.18
@@ -17,6 +17,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
 %description
 This applet looks like the current Gnome Mini-Commander, but it launches search
@@ -51,9 +54,27 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+    killall -HUP gconfd-2 || :
+fi
+
+%post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule /etc/gconf/schemas/%{name}.schemas > /dev/null
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+killall -HUP gconfd-2 || :
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -69,7 +90,7 @@
 %changelog
 * Thu Feb 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.13.90.1-2
 - Added patch for prctl thinko
-- Added %%post for schemas
+- Added schema scripts
 
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.13.90.1-1
 - Upstream update