- up to 2.6.4

diff --git a/flex-build.patch b/flex-build.patch
index 7940698cf7527d5926ae4c2de38eac2b500a81ca..df6abbe60debebcce033fdb192295c24e6ae23aa 100644 (file)
--- a/flex-build.patch
+++ b/flex-build.patch
@@ -1,9 +1,9 @@
 --- a/configure.ac~    2016-10-25 00:29:36.000000000 +0200
 +++ b/configure.ac     2016-12-18 14:55:43.302082497 +0100
 @@ -151,7 +151,6 @@ examples/Makefile
+ examples/Makefile
  examples/fastwc/Makefile
  examples/manual/Makefile
- lib/Makefile
 -po/Makefile.in
  src/Makefile
  tools/Makefile

diff --git a/flex-glibc22.patch b/flex-glibc22.patch
deleted file mode 100644 (file)
index c6b9b5a..0000000
--- a/flex-glibc22.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nur flex-2.5.31.orig/flex.skl flex-2.5.31/flex.skl
---- flex-2.5.31.orig/flex.skl  2003-04-01 03:51:38.000000000 +0200
-+++ flex-2.5.31/flex.skl       2003-06-19 00:41:00.000000000 +0200
-@@ -1973,25 +1973,6 @@
- }
- 
- 
--%if-c-only
--m4_ifdef( [[M4_YY_ALWAYS_INTERACTIVE]],,
--[[
--    m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,
--    [[
--#ifndef __cplusplus
--extern int isatty M4_YY_PARAMS( int );
--#endif /* __cplusplus */
--    ]])
--]])
--%endif
--
--%if-c++-only
--m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,
--[[
--extern "C" int isatty M4_YY_PARAMS( int );
--]])
--%endif
--
- /* Initializes or reinitializes a buffer.
-  * This function is sometimes called more than once on the same buffer,
-  * such as during a yyrestart() or at EOF.
---- flex-2.5.33/scan.c.orig    2006-02-21 03:45:51.000000000 +0100
-+++ flex-2.5.33/scan.c 2006-03-07 23:16:54.545169500 +0100
-@@ -4177,13 +4177,6 @@
- 
- 
- 
--#ifndef YY_ALWAYS_INTERACTIVE
--#ifndef YY_NEVER_INTERACTIVE
--#ifndef __cplusplus
--extern int isatty YY_PARAMS(( int ));
--#endif /* __cplusplus */
--#endif /* !YY_NEVER_INTERACTIVE */
--#endif /* !YY_ALWAYS_INTERACTIVE */
- 
- 
- 

diff --git a/flex.spec b/flex.spec
index bb8b581909263277928199c3bb031e1e8c1b0b85..be14a95e06a8c0389b9bd57f038e5c1a2c9e03a6 100644 (file)
--- a/flex.spec
+++ b/flex.spec
@@ -14,15 +14,15 @@ Summary(ru.UTF-8):  Быстрый генератор лексических ан
 Summary(tr.UTF-8):     GNU sözdizim çözümleyici
 Summary(uk.UTF-8):     Швидкий генератор лексичних аналізаторів GNU
 Name:          flex
-Version:       2.6.3
+Version:       2.6.4
 Release:       1
 License:       BSD-like
 Group:         Development/Tools
 #Source0Download: https://github.com/westes/flex/releases
 # TODO: when upgrading, switch to
 #Source0:      https://github.com/westes/flex/releases/download/v%{version}/%{name}-%{version}.tar.lz
-Source0:       https://github.com/westes/flex/archive/v%{version}.tar.gz
-# Source0-md5: 5a399c7948b0278457392c2fd4f8739f
+Source0:       https://github.com/westes/flex/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 96828d1e36d18545b71a027caa6478dd
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: fd79ee2834b290e74c626f0bbfc8942f
 Patch0:                %{name}-info.patch