rpms/coreutils/devel coreutils-i18n.patch, 1.36, 1.37 coreutils.spec, 1.271, 1.272

[Ondrej Vasik]

Author: ovasik

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

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
fix sort -h for multibyte locales (reported via http://bugs.archlinux.org/task/16022)

coreutils-i18n.patch:
 coreutils-6.11/src/join.c               |  105 +++-
 coreutils-6.12-orig/src/join.c          |    5 
 coreutils-6.12/tests/Makefile.am        |    5 
 coreutils-6.12/tests/misc/cut           |    6 
 coreutils-6.8+/lib/linebuffer.h         |    8 
 coreutils-6.8+/src/cut.c                |  420 ++++++++++++++++++-
 coreutils-6.8+/src/expand.c             |  161 +++++++
 coreutils-6.8+/src/fold.c               |  312 +++++++++++++-
 coreutils-6.8+/src/join.c               |  237 ++++++++++-
 coreutils-6.8+/src/pr.c                 |  431 ++++++++++++++++++--
 coreutils-6.8+/src/sort.c               |  673 ++++++++++++++++++++++++++++++--
 coreutils-6.8+/src/unexpand.c           |  226 ++++++++++
 coreutils-6.8+/src/uniq.c               |  259 +++++++++++-
 coreutils-6.8+/tests/misc/mb1.I         |    4 
 coreutils-6.8+/tests/misc/mb1.X         |    4 
 coreutils-6.8+/tests/misc/mb2.I         |    4 
 coreutils-6.8+/tests/misc/mb2.X         |    4 
 coreutils-6.8+/tests/misc/sort-mb-tests |   58 ++
 18 files changed, 2742 insertions(+), 180 deletions(-)

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- coreutils-i18n.patch	21 Aug 2009 07:00:58 -0000	1.36
+++ coreutils-i18n.patch	8 Sep 2009 14:34:31 -0000	1.37
@@ -2204,7 +2204,7 @@ diff -urNp coreutils-6.11-orig/src/join.
  {
    struct keyfield *key = keylist;
  
-@@ -1875,6 +2265,181 @@
+@@ -1875,6 +2265,179 @@
    return key->reverse ? -diff : diff;
  }
  
@@ -2232,7 +2232,7 @@ diff -urNp coreutils-6.11-orig/src/join.
 +
 +  for (;;)
 +    {
-+      unsigned char *translate = (unsigned char *) key->translate;
++      char const *translate = key->translate;
 +      bool const *ignore = key->ignore;
 +
 +      /* Find the lengths. */
@@ -2242,16 +2242,14 @@ diff -urNp coreutils-6.11-orig/src/join.
 +      /* Actually compare the fields. */
 +      if (key->random)
 +        diff = compare_random (texta, lena, textb, lenb);
-+      else if (key->numeric | key->general_numeric)
++      else if (key->numeric | key->general_numeric | key->human_numeric)
 +	{
 +	  char savea = *lima, saveb = *limb;
 +
 +	  *lima = *limb = '\0';
-+	  if (force_general_numcompare)
-+	    diff = general_numcompare (texta, textb);
-+	  else
-+	    diff = ((key->numeric ? numcompare : general_numcompare)
-+		(texta, textb));
++	  diff = (key->numeric ? numcompare (texta, textb)
++		  : key->general_numeric ? general_numcompare (texta, textb)
++		  : human_numcompare (texta, textb, key));
 +	  *lima = savea, *limb = saveb;
 +	}
 +      else if (key->version)


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- coreutils.spec	3 Sep 2009 15:19:58 -0000	1.271
+++ coreutils.spec	8 Sep 2009 14:34:31 -0000	1.272
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -333,6 +333,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Tue Sep 08 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-5
+- fix sort -h for multibyte locales (reported via
+  http://bugs.archlinux.org/task/16022)
+
 * Thu Sep 03 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-4
 - fixed regression where df -l <device> as regular user
   cause "Permission denied" (#520630, introduced by fix for