From 97e51abe4aa92227e76fb16b05ecbaf8d9149bfe Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Fri, 10 Feb 2006 22:01:46 +0000
Subject: [PATCH] fix wide characters concatenation

---
 gawk-3.1.5-wconcat.patch | 10 ++++++++++
 gawk.spec                |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 gawk-3.1.5-wconcat.patch

diff --git a/gawk-3.1.5-wconcat.patch b/gawk-3.1.5-wconcat.patch
new file mode 100644
index 0000000..397ee33
--- /dev/null
+++ b/gawk-3.1.5-wconcat.patch
@@ -0,0 +1,10 @@
+--- gawk-3.1.5/eval.c.wconcat	2006-02-10 22:45:26.000000000 +0100
++++ gawk-3.1.5/eval.c	2006-02-10 22:46:01.000000000 +0100
+@@ -1176,6 +1176,7 @@
+ 			memcpy(l->stptr + l->stlen, r->stptr, r->stlen);
+ 			l->stlen += r->stlen;
+ 			l->stptr[l->stlen] = '\0';
++			l->flags &= ~WSTRCUR;
+ 		} else {
+ 			char *nval;
+ 			size_t nlen = l->stlen + r->stlen + 2;
diff --git a/gawk.spec b/gawk.spec
index 5f80892..14df913 100644
--- a/gawk.spec
+++ b/gawk.spec
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 5.1
+Release: 6
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -15,6 +15,7 @@ Patch2: gawk-3.1.5-free.patch
 Patch3: gawk-3.1.5-fieldwidths.patch
 Patch4:	gawk-3.1.5-binmode.patch
 Patch5: gawk-3.1.5-num2str.patch
+Patch6: gawk-3.1.5-wconcat.patch
 
 %description
 The gawk packages contains the GNU version of awk, a text processing
@@ -31,6 +32,7 @@ considered to be a standard Linux tool for processing text.
 %patch3 -p1 -b .fieldwidths
 %patch4 -p1 -b .binmode
 %patch5 -p1 -b .num2str
+%patch6 -p1 -b .wconcat
 
 %build
 %configure
@@ -79,6 +81,9 @@ fi
 %{_datadir}/awk
 
 %changelog
+* Fri Feb 10 2006 Karel Zak <kzak@redhat.com> 3.1.5-6
+- fix wide characters concatenation
+
 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 3.1.5-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes