rpms/gawk/devel gawk-3.1.5-wconcat.patch, NONE, 1.1 gawk.spec, 1.32, 1.33

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7549

Modified Files:
	gawk.spec 
Added Files:
	gawk-3.1.5-wconcat.patch 
Log Message:
fix wide characters concatenation

gawk-3.1.5-wconcat.patch:
 eval.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gawk-3.1.5-wconcat.patch ---
--- 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;


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gawk.spec	7 Feb 2006 11:43:35 -0000	1.32
+++ gawk.spec	10 Feb 2006 22:01:46 -0000	1.33
@@ -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 @@
 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 @@
 %patch3 -p1 -b .fieldwidths
 %patch4 -p1 -b .binmode
 %patch5 -p1 -b .num2str
+%patch6 -p1 -b .wconcat
 
 %build
 %configure
@@ -79,6 +81,9 @@
 %{_datadir}/awk
 
 %changelog
+* Fri Feb 10 2006 Karel Zak <kzak at redhat.com> 3.1.5-6
+- fix wide characters concatenation
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.5-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes