[coreutils/f17] multibyte fixes in cut and expand (by M.Briza, #821260)

[Ondrej Vasik]

commit 48e9badb853bb602f29ec108a30807340bb53c5e
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Mon Nov 5 14:00:26 2012 +0100

    multibyte fixes in cut and expand (by M.Briza, #821260)

 coreutils-i18n.patch |    4 ++--
 coreutils.spec       |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch
index a0bd8b0..8a3cbbc 100644
--- a/coreutils-i18n.patch
+++ b/coreutils-i18n.patch
@@ -733,7 +733,7 @@ diff -urNp coreutils-8.13-orig/src/expand.c coreutils-8.13/src/expand.c
 +	  if (convert)
 +	    {
 +	      ++column;
-+	      if (convert_entire_line == 0)
++	      if (convert_entire_line == 0 && !isblank(*bufpos))
 +		convert = 0;
 +	    }
 +	  putchar (*bufpos);
@@ -793,7 +793,7 @@ diff -urNp coreutils-8.13-orig/src/expand.c coreutils-8.13/src/expand.c
 +
 +		      width = wcwidth (wc);
 +		      column += (width > 0) ? width : 0;
-+		      if (convert_entire_line == 0)
++		      if (convert_entire_line == 0 && !iswblank(wc))
 +			convert = 0;
 +		    }
 +		}
diff --git a/coreutils.spec b/coreutils.spec
index 4fb5a55..8d6c0dd 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -427,7 +427,6 @@ fi
 - fix possible free memory read and dataloss in sort -u
   (upstream fix)
 - multibyte fixes in cut and expand (by M.Briza, #821260)
-- add virtual provides for bundled(gnulib) copylib (#821748)
 
 * Fri Jul 13 2012 Ondrej Vasik <ovasik at redhat.com> 8.15-7
 - fix the tcsh colorls.csh behaviour in non-interactive