rpms/coreutils/devel coreutils.spec,1.123,1.124

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14792

Modified Files:
	coreutils.spec 
Log Message:
* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 5.97-2
- Allow 'sort +1 -2' (patch from upstream).



Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- coreutils.spec	25 Jun 2006 23:15:00 -0000	1.123
+++ coreutils.spec	29 Jun 2006 09:06:14 -0000	1.124
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 1
+Release: 2
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -18,6 +18,7 @@
 Source201:  runuser.pamd
 
 # From upstream
+Patch1: coreutils-sort-compatibility.patch
 Patch10: coreutils-newhashes.patch
 
 # Our patches
@@ -74,6 +75,7 @@
 %setup -q
 
 # From upstream
+%patch1 -p1 -b .sort-compatibility
 %patch10 -p1 -b .newhashes
 
 # Our patches
@@ -270,6 +272,9 @@
 /sbin/runuser
 
 %changelog
+* Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 5.97-2
+- Allow 'sort +1 -2' (patch from upstream).
+
 * Sun Jun 25 2006 Tim Waugh <twaugh at redhat.com> 5.97-1
 - 5.97.  No longer need tempname or tee patches, or pl translation.