rpms/coreutils/devel coreutils-i18n.patch, 1.11, 1.12 coreutils.spec, 1.89, 1.90
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Oct 28 15:04:09 UTC 2005
Author: twaugh
Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25743
Modified Files:
coreutils-i18n.patch coreutils.spec
Log Message:
* Fri Oct 28 2005 Tim Waugh <twaugh at redhat.com>
- Fixed for sort-mb-tests (avoid +n syntax).
coreutils-i18n.patch:
lib/linebuffer.h | 8
src/cut.c | 420 +++++++++++++++++++++++++++++++++++++++++++--
src/expand.c | 161 +++++++++++++++++
src/fold.c | 317 +++++++++++++++++++++++++++++++---
src/join.c | 348 ++++++++++++++++++++++++++++++++-----
src/pr.c | 431 ++++++++++++++++++++++++++++++++++++++++++-----
src/unexpand.c | 226 ++++++++++++++++++++++++
src/uniq.c | 259 +++++++++++++++++++++++++++-
tests/sort/Makefile.am | 8
tests/sort/Makefile.in | 8
tests/sort/mb1.I | 4
tests/sort/mb1.X | 4
tests/sort/mb2.I | 4
tests/sort/mb2.X | 4
tests/sort/sort-mb-tests | 58 ++++++
15 files changed, 2101 insertions(+), 159 deletions(-)
Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- coreutils-i18n.patch 27 Oct 2005 15:05:08 -0000 1.11
+++ coreutils-i18n.patch 28 Oct 2005 15:03:19 -0000 1.12
@@ -3082,7 +3082,7 @@
+locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77
+errors=0
+
-+$xx -t ï¼ +1 -n mb1.I > mb1.O
++$xx -t ï¼ -k2 -n mb1.I > mb1.O
+code=$?
+if test $code != 0; then
+ $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2
@@ -3100,7 +3100,7 @@
+ esac
+fi
+
-+$xx -t ï¼ +3 -n mb2.I > mb2.O
++$xx -t ï¼ -k4 -n mb2.I > mb2.O
+code=$?
+if test $code != 0; then
+ $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2
@@ -3171,7 +3171,7 @@
editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-TESTS = $x-tests
-+TESTS = $x-tests # $x-mb-tests
++TESTS = $x-tests $x-mb-tests
mk_script = $(srcdir)/../mk-script
$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
@@ -3192,7 +3192,7 @@
editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-TESTS = $x-tests
-+TESTS = $x-tests # $x-mb-tests
++TESTS = $x-tests $x-mb-tests
mk_script = $(srcdir)/../mk-script
MAINTAINERCLEANFILES = $x-tests $(maint_gen)
CLEANFILES = $(run_gen)
Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- coreutils.spec 28 Oct 2005 11:29:37 -0000 1.89
+++ coreutils.spec 28 Oct 2005 15:03:19 -0000 1.90
@@ -265,6 +265,7 @@
%changelog
* Fri Oct 28 2005 Tim Waugh <twaugh at redhat.com>
+- Fixed for sort-mb-tests (avoid +n syntax).
- Start porting i18n patch to sort.c.
* Fri Oct 28 2005 Tim Waugh <twaugh at redhat.com> 5.92-0.2
More information about the fedora-cvs-commits
mailing list