rpms/gnome-session/devel gnome-session.spec,1.87,1.88

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

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



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gnome-session.spec	8 Sep 2006 02:25:04 -0000	1.87
+++ gnome-session.spec	18 Oct 2006 21:09:07 -0000	1.88
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.16.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -84,6 +84,10 @@
 BuildRequires: libX11-devel libXt-devel
 BuildRequires: libXrandr-devel
 
+Requires(pre): GConf2 >= 2.14
+Requires(post): GConf2 >= 2.14
+Requires(preun): GConf2 >= 2.14
+
 %description
 
 gnome-session manages a GNOME desktop session. It starts up the other core 
@@ -158,13 +162,19 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-session.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-session.schemas > /dev/null || :
 /sbin/ldconfig
 
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-session.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-session.schemas > /dev/null
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-session.schemas > /dev/null || :
 fi
 
 %postun
@@ -185,6 +195,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-4
+- Fix scripts according to the packaging guidelines
+
 * Thu Sep  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-3.fc6
 - Fix position of icons in the splash screen  (#205508)