rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.18,1.19

[fedora-cvs-commits redhat com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26158

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
* Wed Mar 01 2006 Mike A. Harris <mharris redhat com> 1:1.0.1-4
- Fix all rpm scriptlets "upgrade" tests to only execute on upgrades.



Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-xfs.spec	25 Feb 2006 17:23:03 -0000	1.18
+++ xorg-x11-xfs.spec	1 Mar 2006 07:05:32 -0000	1.19
@@ -1,4 +1,3 @@
-#!/bin/bash
 %define pkgname xfs
 
 %define _x11fontdir	%(pkg-config --variable=fontdir fontutil)
@@ -8,7 +7,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 3
+Release: 4
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -169,7 +168,7 @@
 {
   /usr/sbin/useradd -c "X Font Server" -r -s /sbin/nologin -u 43 -d /etc/X11/fs xfs || :
   # Upgrade path:
-  if [ "$1" -ge "1" ] ; then
+  if [ "$1" -gt "1" ] ; then
     if [ -e "/usr/X11R6/lib/X11/fs/config" ] ; then
       cat <<-EOF > "/etc/X11/fs/xfs-migrate"
 	On upgrades, we now must determine if we are upgrading from monolithic
@@ -189,7 +188,7 @@
   /sbin/chkconfig --add xfs
   #------------------------------------------------------------------------
   # Upgrade section
-  if [ "$1" -ge "1" ] ; then
+  if [ "$1" -gt "1" ] ; then
     XORG_CONFIG=/etc/X11/xorg.conf
     XFSCONFIG=/etc/X11/fs/config
 
@@ -248,7 +247,7 @@
 
 %postun
 {
-  if [ "$1" -ge "1" ]; then
+  if [ "$1" -gt "1" ]; then
     /sbin/service xfs condrestart &> /dev/null || :
   fi
 }
@@ -282,10 +281,13 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Wed Mar 01 2006 Mike A. Harris <mharris redhat com> 1:1.0.1-4
+- Fix all rpm scriptlets "upgrade" tests to only execute on upgrades.
+
 * Sat Feb 25 2006 Mike A. Harris <mharris redhat com> 1:1.0.1-3
 - Redirect output of "rm -rf fonts.dir" to /dev/null in xfs.init
 
-* Fri Feb 10 2006 Jesse Keating <jkeating redhat com> - 1:1.0.1-2.1
+* Fri Feb 10 2006 Jesse Keating <jkeating redhat com> 1:1.0.1-2.1
 - bump again for double-long bug on ppc(64)
 
 * Thu Feb  9 2006 Mike A. Harris <mharris redhat com> 1:1.0.1-2