rpms/coreutils/devel coreutils-i18n.patch, 1.21, 1.22 coreutils.spec, 1.179, 1.180

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21963

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
sort -R fix for non-C locales(#249315)

coreutils-i18n.patch:

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- coreutils-i18n.patch	1 Mar 2007 17:36:24 -0000	1.21
+++ coreutils-i18n.patch	29 Oct 2007 16:12:27 -0000	1.22
@@ -2196,7 +2196,7 @@
  {
    struct keyfield const *key = keylist;
  
-@@ -1875,6 +2265,177 @@
+@@ -1875,6 +2265,179 @@
    return key->reverse ? -diff : diff;
  }
  
@@ -2232,7 +2232,9 @@
 +      size_t lenb = limb <= textb ? 0 : limb - textb;
 +
 +      /* Actually compare the fields. */
-+      if (key->numeric | key->general_numeric)
++      if (key->random)
++        diff = compare_random (texta, lena, textb, lenb);
++      else if (key->numeric | key->general_numeric)
 +	{
 +	  char savea = *lima, saveb = *limb;
 +
@@ -2373,7 +2375,7 @@
 +
  /* Compare two lines A and B, returning negative, zero, or positive
     depending on whether A compares less than, equal to, or greater than B. */
- 
+
 @@ -2744,7 +3305,7 @@
    initialize_exit_failure (SORT_FAILURE);
  


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- coreutils.spec	29 Oct 2007 11:36:17 -0000	1.179
+++ coreutils.spec	29 Oct 2007 16:12:27 -0000	1.180
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.9
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -282,6 +282,10 @@
 /sbin/runuser
 
 %changelog
+* Mon Oct 29 2007 Ondrej Vasik <ovasik at redhat.com> - 6.9-10
+- modified coreutils-i18n.patch because of sort -R in
+  a non C locales(fix by Andreas Schwab) (#249315)
+
 * Mon Oct 29 2007 Ondrej Vasik <ovasik at redhat.com> - 6.9-9
 - applied upstream patch for runuser to coreutils-selinux.patch(#232652)
 - License tag to GPLv2+