rpms/coreutils/devel coreutils-i18n.patch, 1.14, 1.15 coreutils.spec, 1.113, 1.114

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9148

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
* Mon May 15 2006 Tim Waugh <twaugh at redhat.com>
- Fixed pr in multibyte locales (bug #189663).


coreutils-i18n.patch:
 coreutils-5.93/lib/linebuffer.h         |    8 
 coreutils-5.93/src/cut.c                |  420 +++++++++++++++++++-
 coreutils-5.93/src/expand.c             |  161 +++++++
 coreutils-5.93/src/fold.c               |  317 ++++++++++++++-
 coreutils-5.93/src/join.c               |  348 ++++++++++++++---
 coreutils-5.93/src/sort.c               |  645 ++++++++++++++++++++++++++++++--
 coreutils-5.93/src/unexpand.c           |  226 +++++++++++
 coreutils-5.93/src/uniq.c               |  259 ++++++++++++
 coreutils-5.93/tests/sort/Makefile.am   |    8 
 coreutils-5.93/tests/sort/Makefile.in   |   99 ++--
 coreutils-5.93/tests/sort/mb1.I         |    4 
 coreutils-5.93/tests/sort/mb1.X         |    4 
 coreutils-5.93/tests/sort/mb2.I         |    4 
 coreutils-5.93/tests/sort/mb2.X         |    4 
 coreutils-5.93/tests/sort/sort-mb-tests |   58 ++
 src/pr.c                                |  433 +++++++++++++++++++--
 16 files changed, 2764 insertions(+), 234 deletions(-)

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- coreutils-i18n.patch	23 Dec 2005 10:48:15 -0000	1.14
+++ coreutils-i18n.patch	15 May 2006 12:49:19 -0000	1.15
@@ -615,8 +615,8 @@
      }
  
    if (optind == argc)
---- coreutils-5.93/src/pr.c.i18n	2005-09-16 08:50:33.000000000 +0100
-+++ coreutils-5.93/src/pr.c	2005-12-23 08:53:01.000000000 +0000
+--- coreutils-5.93/src/pr.c	2005-12-23 08:53:01.000000000 +0000
++++ coreutils-5.95/src/pr.c	2006-05-15 13:45:56.000000000 +0100
 @@ -313,6 +313,32 @@
  
  #include <getopt.h>
@@ -846,7 +846,7 @@
  	  use_col_separator = true;
  	  if (optarg)
  	    separator_string (optarg);
-@@ -1188,10 +1279,45 @@
+@@ -1188,17 +1279,52 @@
     a number. */
  
  static void
@@ -894,6 +894,14 @@
    if (*arg)
      {
        long int tmp_long;
+      We've to use 8 as the lower limit, if we use chars_per_default_tab = 8
+      to expand a tab which is not an input_tab-char. */
+   free (clump_buff);
+-  clump_buff = xmalloc (MAX (8, chars_per_input_tab));
++  clump_buff = xmalloc (MAX (80, chars_per_input_tab));
+ }
+ 
+ /* Open the necessary files,
 @@ -1256,7 +1382,7 @@
  	  else
  	    col_sep_string = column_separator;


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- coreutils.spec	15 May 2006 11:54:00 -0000	1.113
+++ coreutils.spec	15 May 2006 12:49:19 -0000	1.114
@@ -263,6 +263,9 @@
 /sbin/runuser
 
 %changelog
+* Mon May 15 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed pr in multibyte locales (bug #189663).
+
 * Mon May 15 2006 Tim Waugh <twaugh at redhat.com> 5.95-2
 - 5.95.