Resolves: #1238860

- Remove obsolete patches.

flex-2.5.36-bison-2.6.1.patch

@@ -1,88 +0,0 @@
-diff -up flex-2.5.36/tests/test-bison-yylloc/main.c~ flex-2.5.36/tests/test-bison-yylloc/main.c
---- flex-2.5.36/tests/test-bison-yylloc/main.c~	2002-06-25 21:37:06.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylloc/main.c	2012-07-31 18:53:22.007394045 +0200
-@@ -21,8 +21,6 @@
- #include "parser.h"
- #include "scanner.h"
- 
--extern int testparse(yyscan_t);
--
- int main ( int argc, char** argv )
- {
-     yyscan_t scanner;
-diff -up flex-2.5.36/tests/test-bison-yylloc/parser.y~ flex-2.5.36/tests/test-bison-yylloc/parser.y
---- flex-2.5.36/tests/test-bison-yylloc/parser.y~	2002-07-25 02:43:47.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylloc/parser.y	2012-08-01 01:06:53.093155586 +0200
-@@ -21,6 +21,8 @@
-  * PURPOSE.
-  */
- 
-+%parse-param { void* scanner }
-+
- /* 
-    How to compile:
-    bison --defines --output-file="parser.c" --name-prefix="test" parser.y
-@@ -32,10 +34,8 @@
- #include "config.h"
- 
- #define YYERROR_VERBOSE 1
--#define YYPARSE_PARAM scanner
- #define YYLEX_PARAM   scanner
- 
--int yyerror(char* msg);
- extern int testget_lineno(void*);
- 
- 
-@@ -89,7 +89,7 @@ line:
- 
- %%
- 
--int yyerror(char* msg) {
-+int yyerror(void* scanner, char* msg) {
-     fprintf(stderr,"%s\n",msg);
-     return 0;
- }
-diff -up flex-2.5.36/tests/test-bison-yylval/main.c~ flex-2.5.36/tests/test-bison-yylval/main.c
---- flex-2.5.36/tests/test-bison-yylval/main.c~	2002-06-25 21:37:06.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylval/main.c	2012-08-01 01:10:02.015510280 +0200
-@@ -24,8 +24,6 @@
- #include "parser.h"
- #include "scanner.h"
- 
--extern int testparse(yyscan_t);
--
- int main ( int argc, char** argv )
- {
-     yyscan_t scanner;
-diff -up flex-2.5.36/tests/test-bison-yylval/parser.y~ flex-2.5.36/tests/test-bison-yylval/parser.y
---- flex-2.5.36/tests/test-bison-yylval/parser.y~	2002-06-25 21:37:06.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylval/parser.y	2012-08-01 01:13:11.239867147 +0200
-@@ -25,6 +25,7 @@
-    How to compile:
-    bison --defines --output-file="parser.c" --name-prefix="test" parser.y
-  */
-+%parse-param { void* scanner }
- %{
- #include <stdio.h>
- #include <stdlib.h>
-@@ -32,11 +33,8 @@
- #include "config.h"
- 
- #define YYERROR_VERBOSE 1
--#define YYPARSE_PARAM scanner
- #define YYLEX_PARAM   scanner
- 
--int yyerror(char* msg);
--
- 
- /* A dummy function. A check against seg-faults in yylval->str. */
- int process_text(char* s) {
-@@ -76,7 +74,7 @@ starttag:  LT      TAGNAME GT { process_
- endtag:    LTSLASH TAGNAME GT { process_text($2);free($2);} ;
- %%
- 
--int yyerror(char* msg) {
-+int yyerror(void* scanner, char* msg) {
-     fprintf(stderr,"%s\n",msg);
-     return 0;
- }

flex-2.5.37-aarch64.patch

@@ -1,36 +0,0 @@
-diff -urN flex-2.5.36/config.guess flex-2.5.36-aarch64/config.guess
---- flex-2.5.36/config.guess	2012-06-22 16:02:51.000000000 -0500
-+++ flex-2.5.36-aarch64/config.guess	2013-03-03 04:41:12.069186825 -0600
-@@ -854,6 +868,13 @@
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit ;;
-+    aarch64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    aarch64_be:Linux:*:*)
-+	UNAME_MACHINE=aarch64_be
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     arm*:Linux:*:*)
- 	eval $set_cc_for_build
- 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-diff -urN flex-2.5.36/config.sub flex-2.5.36-aarch64/config.sub
---- flex-2.5.36/config.sub	2012-06-22 16:02:51.000000000 -0500
-+++ flex-2.5.36-aarch64/config.sub	2013-03-03 04:41:12.105182658 -0600
-@@ -242,6 +255,7 @@
- 	# Some are omitted here because they have special meanings below.
- 	1750a | 580 \
- 	| a29k \
-+	| aarch64 | aarch64_be \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
-@@ -322,6 +367,7 @@
- 	# Recognize the basic CPU types with company name.
- 	580-* \
- 	| a29k-* \
-+	| aarch64-* | aarch64_be-* \
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \

flex-2.5.37-types.patch

@@ -1,41 +0,0 @@
-From c53fd2db8c78fef5afd284c3e64da51bc71cf6c3 Mon Sep 17 00:00:00 2001
-From: nomis52 <nomis52@users.sourceforge.net>
-Date: Sat, 4 Aug 2012 15:03:31 -0400
-Subject: [PATCH] Change variable types to silence compiler warnings; resolves
- #3552806
-
-Signed-off-by: Will Estes <westes575@gmail.com>
----
- flex.skl |    2 +-
- gen.c    |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/flex.skl b/flex.skl
-index 01d8204..7802f45 100644
---- a/flex.skl
-+++ b/flex.skl
-@@ -2360,7 +2360,7 @@ YY_BUFFER_STATE yy_scan_bytes  YYFARGS2( yyconst char *,yybytes, yy_size_t ,_yyb
- 	YY_BUFFER_STATE b;
- 	char *buf;
- 	yy_size_t n;
--	int i;
-+	yy_size_t i;
-     m4_dnl M4_YY_DECL_GUTS_VAR();
- 
- 	/* Get memory for full buffer, including space for trailing EOB's. */
-diff --git a/gen.c b/gen.c
-index 5a5daef..8d24a86 100644
---- a/gen.c
-+++ b/gen.c
-@@ -1972,7 +1972,7 @@ void make_tables ()
- 		("if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )");
- 	indent_up ();
- 	indent_puts ("{");
--	indent_puts ("int yyl;");
-+	indent_puts ("yy_size_t yyl;");
- 	do_indent ();
- 	out_str ("for ( yyl = %s; yyl < yyleng; ++yyl )\n",
- 		 yymore_used ? (yytext_is_array ? "YY_G(yy_prev_more_offset)" :
--- 
-1.7.6.5
-

flex.spec

@@ -3,7 +3,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.39
-Release: 2%{?dist}
+Release: 3%{?dist}
 # parse.c and parse.h are under GPLv3+ with exception which allows
 #	relicensing.  Since flex is shipped under BDS-style license,
 #	let's  assume that the relicensing was done.
@@ -134,6 +134,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_pkgdocdir}
 
 %changelog
+* Thu Oct 29 2015 Patsy Franklin <pfrankli@redhat.com> - 2.5.39-3
+- Remove obsolete patches from git repository.  (BZ #1238860)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.39-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild