rpms/gnome-netstatus/devel gnome-netstatus.spec,1.31,1.32

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-netstatus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10847

Modified Files:
	gnome-netstatus.spec 
Log Message:
fix scripts



Index: gnome-netstatus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-netstatus.spec	12 Jul 2006 06:00:01 -0000	1.31
+++ gnome-netstatus.spec	18 Oct 2006 15:17:47 -0000	1.32
@@ -1,24 +1,25 @@
 %define gtk2_version 2.6.0
 %define libglade2_version 2.0.0
-%define gconf2_version 2.4.0
+%define gconf2_version 2.14.0
 %define libgnomeui_version 2.5.2
 %define gnome_panel_version 2.5.1
 
 Summary: Network status applet
 Name: gnome-netstatus
 Version: 2.12.0
-Release: 5.1
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.11/%{name}-%{version}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 
-Prereq: GConf2 >= %{gconf2_version}
 Prereq: gtk2 >= %{gtk2_version}
 Requires: gtk2 >= %{gtk2_version}
 Requires: libglade2 >= %{libglade2_version}
-Requires: GConf2 >= %{gconf2_version}
+Requires(pre): GConf2 >= %{gconf2_version}
+Requires(preun): GConf2 >= %{gconf2_version}
+Requires(post): GConf2 >= %{gconf2_version}
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: gnome-panel >= %{gnome_panel_version}
 
@@ -69,15 +70,25 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="netstatus.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/netstatus.schemas > /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/netstatus.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/netstatus.schemas > /dev/null || :
+fi
+
+
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -98,6 +109,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.0-6
+- Fix scripts according to packaging guidelines
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-5.1
 - rebuild