[packages/flex] - updated to 2.5.37 - removed obsolete missing-prototypes,sign patches
qboosh
qboosh at pld-linux.org
Wed Aug 29 18:23:01 CEST 2012
commit d86244b84a0234a79806e0b9f96274221ace6e0b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Aug 29 18:23:08 2012 +0200
- updated to 2.5.37
- removed obsolete missing-prototypes,sign patches
flex-info.patch | 29 -----------------------------
flex-missing-prototypes.patch | 26 --------------------------
flex-sign.patch | 11 -----------
flex.spec | 21 +++++++++------------
4 files changed, 9 insertions(+), 78 deletions(-)
---
diff --git a/flex.spec b/flex.spec
index 5848cd7..2791082 100644
--- a/flex.spec
+++ b/flex.spec
@@ -10,29 +10,27 @@ Summary(ru.UTF-8): Быстрый генератор лексических ан
Summary(tr.UTF-8): GNU sözdizim çözümleyici
Summary(uk.UTF-8): Швидкий генератор лексичних аналізаторів GNU
Name: flex
-Version: 2.5.35
+Version: 2.5.37
Release: 1
License: BSD-like
Group: Development/Tools
Source0: http://downloads.sourceforge.net/flex/%{name}-%{version}.tar.bz2
-# Source0-md5: 10714e50cea54dc7a227e3eddcd44d57
+# Source0-md5: c75940e1fc25108f2a7b3ef42abdae06
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}-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
+Patch3: %{name}-m4-quotes.diff
URL: http://flex.sourceforge.net/
BuildRequires: autoconf >= 2.54
-BuildRequires: automake
+BuildRequires: automake >= 1:1.10
BuildRequires: bison
# to rebuild scan.c from scan.l (m4-quotes patch)
#BuildRequires: flex
-BuildRequires: gettext-devel >= 0.11.5
+BuildRequires: gettext-devel >= 0.12
BuildRequires: help2man
# to rebuild skel.c from patched flex.skl
BuildRequires: m4
@@ -131,12 +129,10 @@ Przykłady dla fleksa.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
+#%patch3 -p1
# force regeneration (just in case make didn't want to)
-rm -f skel.c
+%{__rm} skel.c
%build
%{__gettextize}
@@ -163,8 +159,9 @@ 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} $RPM_BUILD_ROOT%{_mandir}/README.flex-non-english-man-pages
+
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.flex-non-english-man-pages
cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
diff --git a/flex-info.patch b/flex-info.patch
index 15089ec..86c2d83 100644
--- a/flex-info.patch
+++ b/flex-info.patch
@@ -12,32 +12,3 @@
@end direntry
@c %**end of header
---- flex-2.5.31/doc/flex.texi~ 2005-12-25 19:53:23.925467592 +0100
-+++ flex-2.5.31/doc/flex.texi 2005-12-25 19:59:09.244971048 +0100
-@@ -1672,7 +1672,7 @@
- %%
- expect-floats BEGIN(expect);
-
-- <expect>[0-9]+ at samp{.}[0-9]+ {
-+ <expect>[0-9]+\.[0-9]+ {
- printf( "found a float, = %f\n",
- atof( yytext ) );
- }
-@@ -3318,7 +3318,7 @@
- %option interactive
- %option always-interactive
-
-- @samp{^} beginning-of-line operator
-+ ^ beginning-of-line operator
- yymore()
- @end verbatim
- @end example
-@@ -3832,7 +3832,7 @@
- if(c == '\n')
- ++mylineno;
-
-- else if(c == @samp{*})
-+ else if(c == '*')
- {
- if((c = yyinput()) == '/')
- break;
diff --git a/flex-missing-prototypes.patch b/flex-missing-prototypes.patch
deleted file mode 100644
index e54e6f0..0000000
--- a/flex-missing-prototypes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl
---- flex-2.5.35/flex.skl~ 2010-07-13 17:18:43.000000000 +0200
-+++ flex-2.5.35/flex.skl 2010-07-13 17:23:49.000000000 +0200
-@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
- void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
- ]])
-
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,
-+[[
-+int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
-+]])
-+]])
-+
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
-+[[
-+void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );
-+]])
-+]])
-+
- %if-bison-bridge
- m4_ifdef( [[M4_YY_NO_GET_LVAL]],,
- [[
diff --git a/flex-sign.patch b/flex-sign.patch
deleted file mode 100644
index fbee18b..0000000
--- a/flex-sign.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- flex-2.5.35/gen.c-orig 2008-04-30 22:51:08.000000000 +0200
-+++ flex-2.5.35/gen.c 2008-04-30 22:51:14.000000000 +0200
-@@ -1890,7 +1890,7 @@
- outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
- outn ("\t\t{ \\");
- outn ("\t\tint c = '*'; \\");
-- outn ("\t\tint n; \\");
-+ outn ("\t\tunsigned n; \\");
- outn ("\t\tfor ( n = 0; n < max_size && \\");
- outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
- outn ("\t\t\tbuf[n] = (char) c; \\");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/flex.git/commitdiff/d86244b84a0234a79806e0b9f96274221ace6e0b
More information about the pld-cvs-commit
mailing list