From 1982ec12167541a31a21e9ba7f4a9d97bf5107f8130755ec4a6240f71957ac10 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 9 Jan 2007 16:42:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=2 --- coreutils.changes | 5 +++++ coreutils.spec | 8 ++++++-- i18n-monthsort.diff | 11 +++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 i18n-monthsort.diff diff --git a/coreutils.changes b/coreutils.changes index 9e232c6..6e138e1 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 9 13:08:01 CET 2007 - schwab@suse.de + +- Fix localized month sorting [#231790]. + ------------------------------------------------------------------- Wed Dec 13 13:27:36 CET 2006 - schwab@suse.de diff --git a/coreutils.spec b/coreutils.spec index 66c5340..7771c0d 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ # # spec file for package coreutils (Version 6.7) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -21,7 +21,7 @@ Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit >= 9 libselinux-64bit = Autoreqprov: on PreReq: %{install_info_prereq} Version: 6.7 -Release: 3 +Release: 6 Summary: GNU Core Utilities Source: coreutils-%{version}.tar.bz2 Source1: su.pamd @@ -36,6 +36,7 @@ Patch7: coreutils-5.0-pam-env.patch Patch8: coreutils-sysinfo.diff Patch9: acl-test.diff Patch10: getcwd.diff +Patch11: i18n-monthsort.diff Patch16: invalid-ids.diff Patch17: no-no.diff Patch20: coreutils-5.3.0-pie.diff @@ -103,6 +104,7 @@ Authors: %patch8 -p1 %patch9 -p1 %patch10 +%patch11 %patch16 -p1 %patch17 %patch20 @@ -171,6 +173,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{_prefix}/share/locale/*/LC_TIME %changelog -n coreutils +* Tue Jan 09 2007 - schwab@suse.de +- Fix localized month sorting [#231790]. * Wed Dec 13 2006 - schwab@suse.de - Fix acl tests. * Sat Dec 09 2006 - schwab@suse.de diff --git a/i18n-monthsort.diff b/i18n-monthsort.diff new file mode 100644 index 0000000..da18621 --- /dev/null +++ b/i18n-monthsort.diff @@ -0,0 +1,11 @@ +--- src/sort.c ++++ src/sort.c +@@ -748,7 +748,7 @@ + else + { + j += mblength; +- mblength = wcrtomb (mbc, wc, &state_wc); ++ mblength = wcrtomb (mbc, pwc, &state_wc); + assert (mblength != (size_t) 0 && mblength != (size_t) -1); + } +