Hello community, here is the log from the commit of package coreutils for openSUSE:11.4 checked in at Wed Sep 21 02:08:02 CEST 2011.
-------- --- old-versions/11.4/UPDATES/all/coreutils/coreutils.changes 2011-06-08 18:20:59.000000000 +0200 +++ 11.4/coreutils/coreutils.changes 2011-09-02 17:45:33.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 2 16:10:29 CEST 2011 - p...@suse.de + +- cut: Print output delimiter also in multibyte locales (bnc#715272). + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- coreutils-output_delimiter.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _service:set_version:coreutils.spec ++++++ --- /var/tmp/diff_new_pack.hpiHlD/_old 2011-09-21 02:07:36.000000000 +0200 +++ /var/tmp/diff_new_pack.hpiHlD/_new 2011-09-21 02:07:36.000000000 +0200 @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%define run_tests 0 Name: coreutils Summary: GNU Core Utilities @@ -57,6 +57,7 @@ Patch32: coreutils-ptr_int_casts.patch Patch33: coreutils-8.9-singlethreaded-sort.patch Patch34: coreutils-bnc#697897-setsid.patch +Patch35: coreutils-output_delimiter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # this will create a cycle, broken up randomly - coreutils is just too core to have other # prerequires @@ -81,6 +82,7 @@ %patch4 %patch5 %patch6 +%patch35 %patch0 %patch1 %patch2 @@ -112,6 +114,12 @@ make -C po update-po make %{?_smp_mflags} V=1 +%if %{run_tests} > 0 +%check +export RUN_EXPENSIVE_TESTS=yes +make check +%endif + %install %makeinstall test -f $RPM_BUILD_ROOT%{_bindir}/su || \ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.hpiHlD/_old 2011-09-21 02:07:36.000000000 +0200 +++ /var/tmp/diff_new_pack.hpiHlD/_new 2011-09-21 02:07:36.000000000 +0200 @@ -16,6 +16,7 @@ # +%define run_tests 0 Name: coreutils Summary: GNU Core Utilities @@ -24,7 +25,7 @@ License: GFDLv1.2 ; GPLv2+ ; GPLv3+ Group: System/Base Version: 8.9 -Release: 5.<RELEASE9> +Release: 5.<RELEASE11> Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version} Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version} Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9 @@ -57,6 +58,7 @@ Patch32: coreutils-ptr_int_casts.patch Patch33: coreutils-8.9-singlethreaded-sort.patch Patch34: coreutils-bnc#697897-setsid.patch +Patch35: coreutils-output_delimiter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # this will create a cycle, broken up randomly - coreutils is just too core to have other # prerequires @@ -81,6 +83,7 @@ %patch4 %patch5 %patch6 +%patch35 %patch0 %patch1 %patch2 @@ -112,6 +115,13 @@ make -C po update-po make %{?_smp_mflags} V=1 +%if %{run_tests} > 0 + +%check +export RUN_EXPENSIVE_TESTS=yes +make check +%endif + %install %makeinstall test -f $RPM_BUILD_ROOT%{_bindir}/su || \ ++++++ coreutils-output_delimiter.patch ++++++ Index: src/cut.c =================================================================== --- src/cut.c.orig 2011-09-20 14:41:53.301708252 +0200 +++ src/cut.c 2011-09-20 14:52:16.063215689 +0200 @@ -674,15 +674,19 @@ cut_bytes (FILE *stream) static void cut_characters_or_cut_bytes_no_split (FILE *stream) { - int idx; /* number of bytes or characters in the line so far. */ - char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ - char *bufpos; /* Next read position of BUF. */ - size_t buflen; /* The length of the byte sequence in buf. */ - wint_t wc; /* A gotten wide character. */ - size_t mblength; /* The byte size of a multibyte character which shows - as same character as WC. */ - mbstate_t state; /* State of the stream. */ - int convfail; /* 1, when conversion is failed. Otherwise 0. */ + int idx; /* number of bytes or characters in the line so far. */ + char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ + char *bufpos; /* Next read position of BUF. */ + size_t buflen; /* The length of the byte sequence in buf. */ + wint_t wc; /* A gotten wide character. */ + size_t mblength; /* The byte size of a multibyte character which shows + as same character as WC. */ + mbstate_t state; /* State of the stream. */ + int convfail = 0; /* 1, when conversion is failed. Otherwise 0. */ + + /* Whether to begin printing delimiters between ranges for the current line. + Set after we've begun printing data corresponding to the first range. */ + bool print_delimiter = false; idx = 0; buflen = 0; @@ -705,12 +709,24 @@ cut_characters_or_cut_bytes_no_split (FI { putchar ('\n'); idx = 0; + print_delimiter = false; } else { + bool range_start; + bool *rs = output_delimiter_specified ? &range_start : NULL; idx += (operating_mode == byte_mode) ? mblength : 1; - if (print_kth (idx, NULL)) - fwrite (bufpos, mblength, sizeof(char), stdout); + if (print_kth (idx, rs)) + { + if (rs && *rs && print_delimiter) + { + fwrite (output_delimiter_string, sizeof (char), + output_delimiter_length, stdout); + } + + print_delimiter = true; + fwrite (bufpos, mblength, sizeof(char), stdout); + } } buflen -= mblength; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
