rpms/gcalctool/FC-6 gcalctool.spec,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11984

Modified Files:
	gcalctool.spec 
Log Message:
fix scripts



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/FC-6/gcalctool.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gcalctool.spec	1 Oct 2006 05:00:30 -0000	1.25
+++ gcalctool.spec	18 Oct 2006 17:23:44 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           gcalctool
 Version:        5.8.24
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A desktop calculator
 
 Group:          Applications/System
@@ -25,6 +25,7 @@
 Requires(post): GConf2
 Requires(postun): scrollkeeper
 Requires(preun): GConf2
+Requires(pre): GConf2
 
 Patch1: gcalctool-flex-crap.patch
 Patch2: gcalctool-5.8.24-matherr.patch
@@ -65,13 +66,18 @@
 %post
 scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gcalctool.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gcalctool.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/gcalctool.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/gcalctool.schemas > /dev/null || :
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gcalctool.schemas > /dev/null || :
 fi
 
 %postun
@@ -95,6 +101,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 5.8.24-3
+- Fix scripts according to packaging guidelines
+
 * Sun Oct  1 2006 Matthias Clasen <mclasen at redhat.com> - 5.8.24-2
 - Fix a segfault in the or_IN locale due to careless
   string handling.  (#208695)