rpms/xchat/FC-6 xchat.spec,1.59,1.60

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	xchat.spec 
Log Message:
fix scripts



Index: xchat.spec
===================================================================
RCS file: /cvs/dist/rpms/xchat/FC-6/xchat.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xchat.spec	18 Oct 2006 03:03:37 -0000	1.59
+++ xchat.spec	18 Oct 2006 14:10:28 -0000	1.60
@@ -1,12 +1,13 @@
 # Enable this for Fedora Core 2 builds and newer.  For Fedora Core 1,
 # Red Hat Linux 9, and Red Hat Enterprise Linux 3, set to 0
 %define build_fc2		1
+
 %define gconf_version 2.14
 
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.6.6
-Release:   6%{?dist}
+Release:   7%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -39,6 +40,7 @@
 # For gconftool-2:
 Requires(post): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
+
 # Ensure that a compatible libperl is installed
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: gtkspell
@@ -87,7 +89,7 @@
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-makeinstall
+%makeinstall
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Get rid of static libs
@@ -105,13 +107,17 @@
 # Install schema
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas > /dev/null || :
-unset GCONF_CONFIG_SOURCE
+
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas > /dev/null || :
+fi
 
 %preun
-if [ "$1" -gt 0 ]; then
+if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas > /dev/null || :
-  unset GCONF_CONFIG_SOURCE
 fi
 
 %clean
@@ -129,6 +135,9 @@
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 1.2.6.6-7
+- Fix scripts according to packaging guidelines
+
 * Tue Oct 17 2006 Matthias Clasen <mclasen at redhat.com> - 1.2.6.6-6
 - Tighten up Requires (#203813)