From 777ce54cea5e3aac13de242e07c6dbc782f7a3ac Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Mon, 6 Jul 2009 21:40:43 +0000
Subject: [PATCH] do not ignore sort's version sort for multibyte
 locales(#509688)

---
 coreutils-i18n.patch | 12 +++++++-----
 coreutils.spec       |  6 +++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch
index 153c340..a784665 100644
--- a/coreutils-i18n.patch
+++ b/coreutils-i18n.patch
@@ -2204,7 +2204,7 @@ diff -urNp coreutils-6.11-orig/src/join.c coreutils-6.11/src/join.c
  {
    struct keyfield const *key = keylist;
  
-@@ -1875,6 +2265,179 @@
+@@ -1875,6 +2265,181 @@
    return key->reverse ? -diff : diff;
  }
  
@@ -2254,6 +2254,8 @@ diff -urNp coreutils-6.11-orig/src/join.c coreutils-6.11/src/join.c
 +		(texta, textb));
 +	  *lima = savea, *limb = saveb;
 +	}
++      else if (key->version)
++	diff = compare_version (texta, lena, textb, lenb);
 +      else if (key->month)
 +	diff = getmonth (texta, lena) - getmonth (textb, lenb);
 +      else
@@ -2384,7 +2386,7 @@ diff -urNp coreutils-6.11-orig/src/join.c coreutils-6.11/src/join.c
  /* 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 @@
+@@ -2744,7 +3307,7 @@
    initialize_exit_failure (SORT_FAILURE);
  
    hard_LC_COLLATE = hard_locale (LC_COLLATE);
@@ -2393,7 +2395,7 @@ diff -urNp coreutils-6.11-orig/src/join.c coreutils-6.11/src/join.c
    hard_LC_TIME = hard_locale (LC_TIME);
  #endif
  
-@@ -2765,6 +3326,27 @@
+@@ -2765,6 +3328,27 @@
        thousands_sep = -1;
    }
  
@@ -2421,7 +2423,7 @@ diff -urNp coreutils-6.11-orig/src/join.c coreutils-6.11/src/join.c
    have_read_stdin = false;
    inittables ();
  
-@@ -3015,13 +3597,35 @@
+@@ -3015,13 +3599,35 @@
  
  	case 't':
  	  {
@@ -2461,7 +2463,7 @@ diff -urNp coreutils-6.11-orig/src/join.c coreutils-6.11/src/join.c
  		else
  		  {
  		    /* Provoke with `sort -txx'.  Complain about
-@@ -3032,9 +3636,12 @@
+@@ -3032,9 +3638,12 @@
  			   quote (optarg));
  		  }
  	      }
diff --git a/coreutils.spec b/coreutils.spec
index e61e4d4..bc40e9e 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -308,6 +308,10 @@ fi
 /sbin/runuser
 
 %changelog
+* Mon Jul 06 2009 Ondrej Vasik <ovasik@redhat.com> 7.4-3
+- do not ignore sort's version sort for multibyte locales
+  (#509688)
+
 * Thu Jun 16 2009 Ondrej Vasik <ovasik@redhat.com> 7.4-2
 - temporarily workaround probable kernel issue with
   TCSADRAIN(#504798)