rpms/coreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

do not ignore sort's version sort for multibyte locales(#509688)

Browse Source
This commit is contained in:
Ondrej Vasik 2009-07-06 21:40:43 +00:00
parent 7f2b3258d5
commit 777ce54cea
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
coreutils-i18n.patch
View File

@ -2204,7 +2204,7 @@ diff -urNp coreutils-6.11-orig/src/join.c coreutils-6.11/src/join.c
{ {
struct keyfield const *key = keylist; struct keyfield const *key = keylist;
@@ -1875,6 +2265,179 @@ @@ -1875,6 +2265,181 @@
return key->reverse ? -diff : diff; 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)); + (texta, textb));
+ *lima = savea, *limb = saveb; + *lima = savea, *limb = saveb;
+ } + }
+ else if (key->version)
+ diff = compare_version (texta, lena, textb, lenb);
+ else if (key->month) + else if (key->month)
+ diff = getmonth (texta, lena) - getmonth (textb, lenb); + diff = getmonth (texta, lena) - getmonth (textb, lenb);
+ else + 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 /* Compare two lines A and B, returning negative, zero, or positive
depending on whether A compares less than, equal to, or greater than B. */ 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); initialize_exit_failure (SORT_FAILURE);
hard_LC_COLLATE = hard_locale (LC_COLLATE); 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); hard_LC_TIME = hard_locale (LC_TIME);
#endif #endif
@@ -2765,6 +3326,27 @@ @@ -2765,6 +3328,27 @@
thousands_sep = -1; 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; have_read_stdin = false;
inittables (); inittables ();
@@ -3015,13 +3597,35 @@ @@ -3015,13 +3599,35 @@
case 't': case 't':
{ {
@ -2461,7 +2463,7 @@ diff -urNp coreutils-6.11-orig/src/join.c coreutils-6.11/src/join.c
else else
{ {
/* Provoke with `sort -txx'. Complain about /* Provoke with `sort -txx'. Complain about
@@ -3032,9 +3636,12 @@ @@ -3032,9 +3638,12 @@
quote (optarg)); quote (optarg));
} }
} }

6
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 7.4 Version: 7.4
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -308,6 +308,10 @@ fi
/sbin/runuser /sbin/runuser
%changelog %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 * Thu Jun 16 2009 Ondrej Vasik <ovasik@redhat.com> 7.4-2
- temporarily workaround probable kernel issue with - temporarily workaround probable kernel issue with
TCSADRAIN(#504798) TCSADRAIN(#504798)