From 5370755b341e5b967936be5154691d1285995b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= <kasal@fedoraproject.org>
Date: Mon, 10 May 2010 07:41:38 +0000
Subject: [PATCH] - new upstream version - drop upstreamed patches

---
 .cvsignore                  |  2 +-
 gawk-3.1.7-prec-utf8.patch  | 23 -----------------------
 gawk-posix-mode-argv0.patch | 33 ---------------------------------
 gawk.spec                   | 15 +++++++--------
 sources                     |  2 +-
 5 files changed, 9 insertions(+), 66 deletions(-)
 delete mode 100644 gawk-3.1.7-prec-utf8.patch
 delete mode 100644 gawk-posix-mode-argv0.patch

diff --git a/.cvsignore b/.cvsignore
index 5a52625..0a29043 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gawk-3.1.7.tar.xz
+gawk-3.1.8.tar.bz2
diff --git a/gawk-3.1.7-prec-utf8.patch b/gawk-3.1.7-prec-utf8.patch
deleted file mode 100644
index ec9dffe..0000000
--- a/gawk-3.1.7-prec-utf8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- gawk-3.1.7/builtin.c.orig	2010-04-01 15:52:45.000000000 +0200
-+++ gawk-3.1.7/builtin.c	2010-04-01 15:57:17.000000000 +0200
-@@ -1218,9 +1218,18 @@ check_pos:
- 			if (fw == 0 && ! have_prec)
- 				;
- 			else if (gawk_mb_cur_max > 1 && (cs1 == 's' || cs1 == 'c')) {
-+				int nchars_needed = 0;
-+
- 				assert(cp == arg->stptr || cp == cpbuf);
--				copy_count = mbc_byte_count(arg->stptr,
--						cs1 == 's' ? arg->stlen : 1);
-+
-+				if (cs1 == 'c')
-+					nchars_needed = 1;
-+				else if (have_prec)
-+					nchars_needed = prec;
-+				else
-+					nchars_needed = arg->stlen;
-+
-+				copy_count = mbc_byte_count(arg->stptr, nchars_needed);
- 			}
- 			bchunk(cp, copy_count);
- 			while (fw > prec) {
diff --git a/gawk-posix-mode-argv0.patch b/gawk-posix-mode-argv0.patch
deleted file mode 100644
index 46eb10f..0000000
--- a/gawk-posix-mode-argv0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Sun Oct  4 21:46:11 2009  Arnold D. Robbins  <arnold@skeeve.com>
-
-	* main.c (main): Don't reset argv[0] to myname. In call
-	to `init_args', pass argv[0] if do_posix. Based on
-	Fedora bug report.
-
-Index: main.c
-===================================================================
-RCS file: /d/mongo/cvsrep/gawk-stable/main.c,v
-retrieving revision 1.24
-diff -u -r1.24 main.c
---- main.c	9 Jul 2009 19:54:38 -0000	1.24
-+++ main.c	4 Oct 2009 19:46:06 -0000
-@@ -306,7 +306,6 @@
- #undef STACK_SIZE
- 
- 	myname = gawk_name(argv[0]);
--        argv[0] = (char *) myname;
- 	os_arg_fixup(&argc, &argv); /* emulate redirection, expand wildcards */
- 
- 	/* remove sccs gunk */
-@@ -586,7 +585,9 @@
- 		optind++;
- 	}
- 
--	init_args(optind, argc, myname, argv);
-+	init_args(optind, argc,
-+			do_posix ? argv[0] : myname,
-+			argv);
- 	(void) tokexpand();
- 
- #if defined(LC_NUMERIC)
-
diff --git a/gawk.spec b/gawk.spec
index f937fd3..ef363bb 100644
--- a/gawk.spec
+++ b/gawk.spec
@@ -1,14 +1,11 @@
 Summary: The GNU version of the awk text processing utility
 Name: gawk
-Version: 3.1.7
-Release: 3%{?dist}
+Version: 3.1.8
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 URL: http://www.gnu.org/software/gawk/gawk.html
-Source0: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
-# Patch from Arnold, the upstream maintainer:
-Patch0: gawk-posix-mode-argv0.patch
-Patch1: gawk-3.1.7-prec-utf8.patch
+Source0: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/install-info
@@ -24,8 +21,6 @@ considered to be a standard Linux tool for processing text.
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1 -b .prec-utf8
 
 %build
 %configure --bindir=/bin --disable-libsigsegv
@@ -74,6 +69,10 @@ fi
 %{_datadir}/awk
 
 %changelog
+* Fri May  7 2010 Stepan Kasal <kasal@ucw.cz> - 3.1.8-1
+- new upstream version
+- drop upstreamed patches
+
 * Thu Apr 01 2010 Jan Zeleny <jzeleny@redhat.com> - 3.1.7-3
 - fix issue with utf8 precision recognition (#513234)
 
diff --git a/sources b/sources
index 0eedc40..0598066 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f16a68357c10c385ac76066b264f39d  gawk-3.1.7.tar.xz
+52b41c6c4418b3226dfb8f82076193bb  gawk-3.1.8.tar.bz2