rpms/xorg-x11-xkbdata/devel xorg-x11-xkbdata.spec,1.9,1.10

[fedora-cvs-commits redhat com]

Author: mharris

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

Modified Files:
	xorg-x11-xkbdata.spec 
Log Message:
* Tue Feb 28 2006 Mike A. Harris <mharris redhat com> 1.0.1-5
- Fixed rpm pre script upgrade/install testing
- Rebuild package as 1.0.1-5 in rawhide, completing the transition to
  xkeyboard-config.



Index: xorg-x11-xkbdata.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-xkbdata.spec	1 Mar 2006 03:28:35 -0000	1.9
+++ xorg-x11-xkbdata.spec	1 Mar 2006 03:41:39 -0000	1.10
@@ -10,7 +10,7 @@
 Name: xorg-x11-xkbdata
 Version: 1.0.1
 # When rebuilding, bump the final digit only
-Release: 4.%{tarver}.xkbcfg.5
+Release: 5
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -63,7 +63,7 @@
 %pre
 {
   # Upgrade section
-  if [ "$1" -ge "1" ] ; then
+  if [ "$1" -gt "1" ] ; then
     # The modular X11R7.0 xkbdata package has symbols/pc as a directory, however
     # xkeyboard-config has it as a file.  rpm can't deal with this during package
     # upgrades from xorg-x11-xkbdata to xkeyboard-config, so we have to remove
@@ -82,6 +82,11 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Feb 28 2006 Mike A. Harris <mharris redhat com> 1.0.1-5
+- Fixed rpm pre script upgrade/install testing
+- Rebuild package as 1.0.1-5 in rawhide, completing the transition to
+  xkeyboard-config.
+
 * Tue Feb 28 2006 Mike A. Harris <mharris redhat com> 1.0.1-4.0.7.xkbcfg.5
 - Added rpm pre script, to pre-remove the symbols/pc during package upgrades,
   to avoid an rpm cpio error if the X11R7.0 modular xkbdata package is already