X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=flex.spec;h=5848cd79d4eb48d104aa2a12dbc3fb5ab814d554;hb=2ad2ae42a2ca543054952033e1a37eac23dccabc;hp=e5a12818d45397dfaa5f11b2ef029e23bca0cd87;hpb=d34bc9e09170e9cab499735b237a75e0b01d552a;p=packages%2Fflex.git

diff --git a/flex.spec b/flex.spec
index e5a1281..5848cd7 100644
--- a/flex.spec
+++ b/flex.spec
@@ -1,3 +1,5 @@
+# NOTE: 2.5.35+ can't deal with "[[" "]]" strings in sources, needs workarounds like space separation
+#       (or update of m4-quotes patch)
 Summary:	GNU fast lexical analyzer generator
 Summary(de.UTF-8):	GNU - schneller lexikalischer Analysegenerator
 Summary(es.UTF-8):	Generador rápido de analizadores léxicos de la GNU
@@ -8,35 +10,37 @@ Summary(ru.UTF-8):	Быстрый генератор лексических ан
 Summary(tr.UTF-8):	GNU sözdizim çözümleyici
 Summary(uk.UTF-8):	Швидкий генератор лексичних аналізаторів GNU
 Name:		flex
-Version:	2.5.33
-Release:	2
+Version:	2.5.35
+Release:	1
 License:	BSD-like
 Group:		Development/Tools
-Source0:	http://dl.sourceforge.net/flex/%{name}-%{version}.tar.bz2
-# Source0-md5:	343374a00b38d9e39d1158b71af37150
+Source0:	http://downloads.sourceforge.net/flex/%{name}-%{version}.tar.bz2
+# Source0-md5:	10714e50cea54dc7a227e3eddcd44d57
 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}-glibc22.patch
-Patch2:		%{name}-locale.patch
-# patch #869230 (second version of bug #720983 fix)
-Patch3:		%{name}-m4-quotes.diff
+Patch1:		%{name}-locale.patch
+Patch2:		%{name}-gcc44.patch
+Patch3:		%{name}-missing-prototypes.patch
+Patch4:		%{name}-sign.patch
+# patch #869230 (second version of bug #720983 fix - from flex BTS)
+# outdated as for 2.5.34+, but contains testcase
+Patch5:		%{name}-m4-quotes.diff
 URL:		http://flex.sourceforge.net/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 BuildRequires:	bison
-# m4-quotes* patches require rebuilding *.c from scan.l
-BuildRequires:	flex
+# to rebuild scan.c from scan.l (m4-quotes patch)
+#BuildRequires:	flex
 BuildRequires:	gettext-devel >= 0.11.5
 BuildRequires:	help2man
+# to rebuild skel.c from patched flex.skl
+BuildRequires:	m4
 BuildRequires:	texinfo
 BuildRequires:	util-linux
+Requires:	m4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags_amd64		-fPIC
-%define		specflags_ia32e		-fPIC
-%define		specflags_x86_64	-fPIC
-
 %description
 This is the GNU fast lexical analyzer generator. It generates lexical
 tokenizing code based on a lexical (regular expression based)
@@ -128,6 +132,8 @@ Przykłady dla fleksa.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+#%patch5 -p1
 
 # force regeneration (just in case make didn't want to)
 rm -f skel.c
@@ -155,32 +161,40 @@ ln -sf flex $RPM_BUILD_ROOT%{_bindir}/flex++
 
 echo .so flex.1 > $RPM_BUILD_ROOT%{_mandir}/man1/flex++.1
 echo .so flex.1 > $RPM_BUILD_ROOT%{_mandir}/man1/lex.1
+
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_mandir}/README.flex-non-english-man-pages
 
-cp -Rf examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/flex
+%attr(755,root,root) %{_bindir}/flex++
+%attr(755,root,root) %{_bindir}/lex
+%{_mandir}/man1/flex.1*
+%{_mandir}/man1/flex++.1*
+%{_mandir}/man1/lex.1*
 %lang(es) %{_mandir}/es/man1/*
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
-%{_infodir}/flex*
-%{_libdir}/*.a
-%{_includedir}/*.h
+%{_infodir}/flex.info*
+%{_libdir}/libfl.a
+%{_libdir}/libfl_pic.a
+%{_includedir}/FlexLexer.h
 
 %files examples
 %defattr(644,root,root,755)