From 4516e3c9335f17bad5a301274d1a4488f99cd299 Mon Sep 17 00:00:00 2001
From: "Vojtech Vitek (V-Teq)" <vvitek@redhat.com>
Date: Mon, 17 Oct 2011 02:07:46 +0200
Subject: [PATCH] Remove obsolete patches

Remove gawk-3.1.8-syntax.patch, gawk-3.1.8-double-free-wstptr.patch
---
 gawk-3.1.8-double-free-wstptr.patch | 23 -----------------------
 gawk-3.1.8-syntax.patch             | 22 ----------------------
 gawk.spec                           |  4 ++--
 3 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 gawk-3.1.8-double-free-wstptr.patch
 delete mode 100644 gawk-3.1.8-syntax.patch

diff --git a/gawk-3.1.8-double-free-wstptr.patch b/gawk-3.1.8-double-free-wstptr.patch
deleted file mode 100644
index 21fd118..0000000
--- a/gawk-3.1.8-double-free-wstptr.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: node.c
-===================================================================
-RCS file: /sources/gawk/gawk-devel/node.c,v
-retrieving revision 1.3
-diff -u -r1.3 node.c
---- node.c	6 May 2010 19:00:58 -0000	1.3
-+++ node.c	27 Oct 2010 17:56:49 -0000
-@@ -758,6 +758,15 @@
- 
- 	assert((n->flags & (STRING|STRCUR)) != 0);
- 
-+	/*
-+	 * Don't convert global null string or global null field
-+	 * variables to a wide string. They are both zero-length anyway.
-+	 * This also avoids future double-free errors while releasing
-+	 * shallow copies, eg. *tmp = *Null_field; free_wstr(tmp);
-+	 */
-+	if (n == Nnull_string || n == Null_field)
-+		return n;
-+
- 	if ((n->flags & WSTRCUR) != 0) {
- 		if (ptr == NULL)
- 			return n;
diff --git a/gawk-3.1.8-syntax.patch b/gawk-3.1.8-syntax.patch
deleted file mode 100644
index 67ad398..0000000
--- a/gawk-3.1.8-syntax.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gawk-3.1.7/awkgram.y.orig	2010-06-25 10:08:11.000000000 +0200
-+++ gawk-3.1.7/awkgram.y	2010-06-25 10:10:34.000000000 +0200
-@@ -164,7 +164,7 @@
- %nonassoc LEX_IN
- %left FUNC_CALL LEX_BUILTIN LEX_LENGTH
- %nonassoc ','
--%nonassoc MATCHOP
-+%left MATCHOP
- %nonassoc RELOP '<' '>' IO_IN IO_OUT
- %left CONCAT_OP
- %left YSTRING YNUMBER
-@@ -702,8 +702,8 @@
- 	 */
- print_expression_list
- 	: opt_expression_list
--	| '(' exp comma expression_list r_paren
--		{ $$ = node($2, Node_expression_list, $4); }
-+	| '(' expression_list r_paren
-+		{ $$ = $2; }
- 	;
- 
- output_redir
diff --git a/gawk.spec b/gawk.spec
index 48f9d6f..ad8dcc9 100644
--- a/gawk.spec
+++ b/gawk.spec
@@ -72,8 +72,8 @@ fi
 
 %changelog
 * Thu Jul 14 2011 Vojtech Vitek (V-Teq) <vvitek@redhat.com> - 4.0.0-1
-- Update to upstream 4.0.0
-  Resolves: #717885
+- Remove gawk-3.1.8-syntax.patch, gawk-3.1.8-double-free-wstptr.patch
+- Update to upstream 4.0.0 (#717885)
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild