rpms/coreutils/devel coreutils-i18n.patch, 1.34, 1.35 coreutils.spec, 1.261, 1.262

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28293

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
do not ignore sort's version sort for multibyte locales(#509688)

coreutils-i18n.patch:

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- coreutils-i18n.patch	23 Apr 2009 17:01:01 -0000	1.34
+++ coreutils-i18n.patch	6 Jul 2009 21:40:43 -0000	1.35
@@ -2204,7 +2204,7 @@ diff -urNp coreutils-6.11-orig/src/join.
  {
    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.
 +		(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.
  /* 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.
    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.
    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.
  		else
  		  {
  		    /* Provoke with `sort -txx'.  Complain about
-@@ -3032,9 +3636,12 @@
+@@ -3032,9 +3638,12 @@
  			   quote (optarg));
  		  }
  	      }


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- coreutils.spec	11 Jun 2009 08:26:29 -0000	1.261
+++ coreutils.spec	6 Jul 2009 21:40:43 -0000	1.262
@@ -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 at redhat.com> 7.4-3
+- do not ignore sort's version sort for multibyte locales
+  (#509688)
+
 * Thu Jun 16 2009 Ondrej Vasik <ovasik at redhat.com> 7.4-2
 - temporarily workaround probable kernel issue with
   TCSADRAIN(#504798)