add build fix from fedora

[packages/flex.git] / flex.spec

diff --git a/flex.spec b/flex.spec
index 9843bc4f75e5f88eb7b56877902dc311502c5987..1de68e9f3ad8bafcd41ebf6b9180c084b807517b 100644 (file)
--- a/flex.spec
+++ b/flex.spec
@@ -1,5 +1,3 @@
-# NOTE: 2.5.35+ can't deal with "[[" "]]" strings in sources, needs workarounds like space separation
-#      (or non-trivial update of m4-quotes patch)
 # NOTE on shared libfl:
 #      It exports two functions, yywrap() and main();
 #      - because of the latter, unnecessary linking with shared -lfl would harm,
@@ -16,31 +14,38 @@ Summary(ru.UTF-8):  Быстрый генератор лексических ан
 Summary(tr.UTF-8):     GNU sözdizim çözümleyici
 Summary(uk.UTF-8):     Швидкий генератор лексичних аналізаторів GNU
 Name:          flex
-Version:       2.5.38
+Version:       2.6.4
 Release:       1
 License:       BSD-like
 Group:         Development/Tools
-Source0:       http://downloads.sourceforge.net/flex/%{name}-%{version}.tar.bz2
-# Source0-md5: b230c88e65996ff74994d08a2a2e0f27
+#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}/%{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
-Patch1:                %{name}-pic.patch
-# patch #869230 (second version of bug #720983 fix - from flex BTS)
-# outdated as for 2.5.34+, but contains testcase
-Patch2:                %{name}-m4-quotes.diff
-URL:           http://flex.sourceforge.net/
+Patch1:                %{name}-build.patch
+Patch2:                %{name}-rh1389575.patch
+URL:           https://github.com/westes/flex
 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-devel >= 0.12
+BuildRequires: gettext-tools >= 0.19
 BuildRequires: help2man
+BuildRequires: libtool >= 2:2
 # to rebuild skel.c from patched flex.skl
 BuildRequires: m4
+BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo
+BuildRequires: texinfo-texi2dvi
+BuildRequires: texlive-fonts-cmsuper
+BuildRequires: texlive-pdftex
 BuildRequires: util-linux
+BuildRequires: xz
 Requires:      m4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -133,13 +138,14 @@ Przykłady dla fleksa.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 
 # force regeneration (just in case make didn't want to)
-%{__rm} skel.c
+%{__rm} -f src/skel.c
 
 %build
 %{__gettextize}
+%{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
@@ -185,7 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%doc AUTHORS COPYING NEWS README.md THANKS
 %attr(755,root,root) %{_bindir}/flex
 %attr(755,root,root) %{_bindir}/flex++
 %attr(755,root,root) %{_bindir}/lex
@@ -197,7 +203,6 @@ rm -rf $RPM_BUILD_ROOT
 %lang(pl) %{_mandir}/pl/man1/*
 %{_infodir}/flex.info*
 %{_libdir}/libfl.a
-%{_libdir}/libfl_pic.a
 %{_includedir}/FlexLexer.h
 
 %if 0
@@ -205,13 +210,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfl.so.2
-%attr(755,root,root) %{_libdir}/libfl_pic.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfl_pic.so.2
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfl.so
-%attr(755,root,root) %{_libdir}/libfl_pic.so
 %endif
 
 %files examples