From 182f35ee21418b9cf6f6f4a835ab3fcfd3b093d5 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Oct 29 2007 16:12:27 +0000
Subject: sort -R fix for non-C locales(#249315)


---

diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch
index 44b0dd9..108cbc3 100644
--- a/coreutils-i18n.patch
+++ b/coreutils-i18n.patch
@@ -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);
  
diff --git a/coreutils.spec b/coreutils.spec
index f260e1a..10e001c 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -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 @@ fi
 /sbin/runuser
 
 %changelog
+* Mon Oct 29 2007 Ondrej Vasik <ovasik@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@redhat.com> - 6.9-9
 - applied upstream patch for runuser to coreutils-selinux.patch(#232652)
 - License tag to GPLv2+