rpms/gok/devel gok.spec,1.39,1.40

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gok/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11678

Modified Files:
	gok.spec 
Log Message:
fix scripts



Index: gok.spec
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gok.spec	8 Sep 2006 16:53:41 -0000	1.39
+++ gok.spec	18 Oct 2006 17:18:47 -0000	1.40
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Patch2: gok-0.10.2-launcher.patch
 
+Requires(pre):   GConf2
 Requires(post):   GConf2
 Requires(post):   scrollkeeper >= 0.1.4
 Requires(preun):   GConf2
@@ -75,13 +76,18 @@
 %post
 scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gok.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gok.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/gok.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/gok.schemas > /dev/null || :
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gok.schemas > /dev/null || :
 fi
 
 %postun
@@ -108,6 +114,9 @@
 %{_libdir}/pkgconfig/*pc
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 1.2.0-2
+- Fix scripts according to packaging guidelines
+
 * Fri Sep  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.2.0-1
 - Update to 1.2.0
 - Fix directory ownership issues (#205681)