rpms/gnome-pilot/devel gnome-pilot.spec,1.60,1.61

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-pilot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16005

Modified Files:
	gnome-pilot.spec 
Log Message:

* Wed Oct 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-10.fc8
- Remove the GConf schemas in preun, not postun (RH bug #246776).



Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnome-pilot.spec	26 Sep 2007 17:49:40 -0000	1.60
+++ gnome-pilot.spec	3 Oct 2007 19:20:14 -0000	1.61
@@ -4,7 +4,7 @@
 
 Name: gnome-pilot
 Version: 2.0.15
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPL
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -107,23 +107,31 @@
 
 %post
 /sbin/ldconfig
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/pilot.schemas > /dev/null
-scrollkeeper-update
+gconftool-2 --makefile-install-rule				\
+	%{_sysconfdir}/gconf/schemas/pilot.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/pilot.schemas > /dev/null
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	gconftool-2 --makefile-uninstall-rule			\
+		%{_sysconfdir}/gconf/schemas/pilot.schemas	\
+		>& /dev/null || :
 fi
 
-%postun
+%preun
 if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/pilot.schemas > /dev/null
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	gconftool-2 --makefile-uninstall-rule			\
+		%{_sysconfdir}/gconf/schemas/pilot.schemas	\
+		>& /dev/null || :
 fi
+
+%postun
 /sbin/ldconfig
-scrollkeeper-update
+scrollkeeper-update -q
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -156,6 +164,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Oct 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-10.fc8
+- Remove the GConf schemas in preun, not postun (RH bug #246776).
+
 * Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.0.15-9
 - Fix the build with new intltool