- updated to 2.6.0

- updated pic patch

diff --git a/flex-pic.patch b/flex-pic.patch
index fa9db264984622999e24e9af6e91664c90836d36..735db5fe373bcaa262366ff3b4b0994491902581 100644 (file)
--- a/flex-pic.patch
+++ b/flex-pic.patch
@@ -1,9 +1,9 @@
---- flex-2.5.38/Makefile.am.orig       2013-05-28 23:56:49.000000000 +0200
-+++ flex-2.5.38/Makefile.am    2014-02-15 11:43:17.418862008 +0100
-@@ -80,6 +80,7 @@
+--- flex-2.6.0/src/Makefile.am.orig    2015-11-13 20:32:53.000000000 +0100
++++ flex-2.6.0/src/Makefile.am 2016-03-17 18:05:55.876418330 +0100
+@@ -46,6 +46,7 @@
        libyywrap.c
  
- libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
+ libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
 +libfl_pic_la_CFLAGS = -fPIC
  
  noinst_HEADERS = \

diff --git a/flex.spec b/flex.spec
index 3b2e402e4fc5b4f426b092d1310bfbe1ebc7b686..e6b6484ab38b163cec93abbc8ca2663a80f60108 100644 (file)
--- a/flex.spec
+++ b/flex.spec
@@ -16,12 +16,12 @@ Summary(ru.UTF-8):  Быстрый генератор лексических ан
 Summary(tr.UTF-8):     GNU sözdizim çözümleyici
 Summary(uk.UTF-8):     Швидкий генератор лексичних аналізаторів GNU
 Name:          flex
-Version:       2.5.39
-Release:       2
+Version:       2.6.0
+Release:       1
 License:       BSD-like
 Group:         Development/Tools
 Source0:       http://downloads.sourceforge.net/flex/%{name}-%{version}.tar.xz
-# Source0-md5: 477679c37ff8b28248a9b05f1da29a82
+# Source0-md5: 3cbbfa1554d0b75fad9f8100732454de
 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
@@ -31,11 +31,11 @@ Patch1:             %{name}-pic.patch
 Patch2:                %{name}-m4-quotes.diff
 URL:           http://flex.sourceforge.net/
 BuildRequires: autoconf >= 2.54
-BuildRequires: automake >= 1:1.10
+BuildRequires: automake >= 1:1.14.1
 BuildRequires: bison
 # to rebuild scan.c from scan.l (m4-quotes patch)
 #BuildRequires:        flex
-BuildRequires: gettext-tools >= 0.18.1
+BuildRequires: gettext-tools >= 0.19
 BuildRequires: help2man
 BuildRequires: libtool >= 2:2
 # to rebuild skel.c from patched flex.skl
@@ -142,7 +142,7 @@ Przykłady dla fleksa.
 #%patch2 -p1
 
 # force regeneration (just in case make didn't want to)
-%{__rm} skel.c
+%{__rm} src/skel.c
 
 %build
 %{__gettextize}