rpms/gnome-system-monitor/FC-6 gnome-system-monitor.spec,1.60,1.61

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11238

Modified Files:
	gnome-system-monitor.spec 
Log Message:
fix scripts



Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/FC-6/gnome-system-monitor.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnome-system-monitor.spec	5 Sep 2006 18:57:30 -0000	1.60
+++ gnome-system-monitor.spec	18 Oct 2006 20:37:55 -0000	1.61
@@ -7,16 +7,16 @@
 %define gtk2_version 2.6.0
 %define desktop_file_utils_version 0.2.90
 %define libselinux_version 1.23.2
+%define gconf_version 2.14
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
 Version: 2.16.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/
 Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.15/gnome-system-monitor-%{version}.tar.bz2
-# po/LINGUAS disaster
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: libgtop2 >= %{libgtop2_version}
@@ -33,9 +33,10 @@
 BuildRequires: libselinux-devel >= %{libselinux_version}
 BuildRequires: gnome-icon-theme
 
-Requires(post): GConf2
+Requires(pre): GConf2 >= %{gconf_version}
+Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
-Requires(preun): GConf2
+Requires(preun): GConf2 >= %{gconf_version}
 Requires(postun): scrollkeeper
 
 Obsoletes: gtop
@@ -72,7 +73,14 @@
 %post
 scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-system-monitor.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-system-monitor.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-system-monitor.schemas > /dev/null || :
+fi
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -93,6 +101,9 @@
 %{_datadir}/omf/gnome-system-monitor/
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-2
+- Fix scripts according to the packaging guidelines
+
 * Tue Sep  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-1.fc6
 - Update to 2.16.0