rpms/gnome-terminal/devel gnome-terminal.spec,1.67,1.68

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

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



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-terminal.spec	8 Sep 2006 16:35:49 -0000	1.67
+++ gnome-terminal.spec	18 Oct 2006 19:48:06 -0000	1.68
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.16.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Patch0: gnome-terminal-2.12.0-inputmethod.patch
@@ -29,9 +29,10 @@
 Requires: pango >= %{pango_version}
 
 # gconftool-2
-Requires(post): GConf2
+Requires(pre): GConf2 >= 2.14
+Requires(post): GConf2 >= 2.14
 Requires(post): scrollkeeper
-Requires(preun): GConf2
+Requires(preun): GConf2 >= 2.14
 Requires(postun): scrollkeeper
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -89,7 +90,14 @@
 %post
 scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-terminal.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-terminal.schemas > /dev/null || :
+fi
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -116,6 +124,9 @@
 %{_libdir}/bonobo/servers/gnome-terminal.server
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-3
+- Fix scripts according to packaging guidelines
+
 * Fri Sep  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-2
 - Fix directory ownership issues (#205679)