[flex] Rebase to 2.5.36
Petr Machata
pmachata at fedoraproject.org
Tue Jul 31 23:17:23 UTC 2012
commit 9c353052ccd4265e05bacddf0f5609ded25a2435
Author: Petr Machata <pmachata at redhat.com>
Date: Wed Aug 1 01:16:49 2012 +0200
Rebase to 2.5.36
.gitignore | 1 +
flex-2.5.35-gcc44.patch | 22 --------
flex-2.5.35-hardening.patch | 36 -------------
flex-2.5.35-missing-prototypes.patch | 53 -------------------
flex-2.5.35-sign.patch | 11 ----
flex-2.5.36-bison-2.6.1.patch | 92 ++++++++++++++++++++++++++++++++++
flex.spec | 38 ++++++++++----
sources | 2 +-
8 files changed, 122 insertions(+), 133 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da4a7e7..241951b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
flex-2.5.35.tar.bz2
/flex*/
*.rpm
+/flex-2.5.36.tar.bz2
diff --git a/flex-2.5.36-bison-2.6.1.patch b/flex-2.5.36-bison-2.6.1.patch
new file mode 100644
index 0000000..a9e11aa
--- /dev/null
+++ b/flex-2.5.36-bison-2.6.1.patch
@@ -0,0 +1,92 @@
+diff -up flex-2.5.36/tests/test-bison-yylloc/main.c~ flex-2.5.36/tests/test-bison-yylloc/main.c
+--- flex-2.5.36/tests/test-bison-yylloc/main.c~ 2002-06-25 21:37:06.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylloc/main.c 2012-07-31 18:53:22.007394045 +0200
+@@ -21,11 +21,10 @@
+ * PURPOSE.
+ */
+
++#define YYPARSE_PARAM scanner
+ #include "parser.h"
+ #include "scanner.h"
+
+-extern int testparse(yyscan_t);
+-
+ int main ( int argc, char** argv )
+ {
+ yyscan_t scanner;
+diff -up flex-2.5.36/tests/test-bison-yylloc/parser.y~ flex-2.5.36/tests/test-bison-yylloc/parser.y
+--- flex-2.5.36/tests/test-bison-yylloc/parser.y~ 2002-07-25 02:43:47.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylloc/parser.y 2012-08-01 01:06:53.093155586 +0200
+@@ -21,6 +21,8 @@
+ * PURPOSE.
+ */
+
++%parse-param { void* scanner }
++
+ /*
+ How to compile:
+ bison --defines --output-file="parser.c" --name-prefix="test" parser.y
+@@ -32,10 +34,8 @@
+ #include "config.h"
+
+ #define YYERROR_VERBOSE 1
+-#define YYPARSE_PARAM scanner
+ #define YYLEX_PARAM scanner
+
+-int yyerror(char* msg);
+ extern int testget_lineno(void*);
+
+
+@@ -89,7 +89,7 @@ line:
+
+ %%
+
+-int yyerror(char* msg) {
++int yyerror(void* scanner, char* msg) {
+ fprintf(stderr,"%s\n",msg);
+ return 0;
+ }
+diff -up flex-2.5.36/tests/test-bison-yylval/main.c~ flex-2.5.36/tests/test-bison-yylval/main.c
+--- flex-2.5.36/tests/test-bison-yylval/main.c~ 2002-06-25 21:37:06.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylval/main.c 2012-08-01 01:10:02.015510280 +0200
+@@ -24,8 +24,6 @@
+ #include "parser.h"
+ #include "scanner.h"
+
+-extern int testparse(yyscan_t);
+-
+ int main ( int argc, char** argv )
+ {
+ yyscan_t scanner;
+diff -up flex-2.5.36/tests/test-bison-yylval/parser.y~ flex-2.5.36/tests/test-bison-yylval/parser.y
+--- flex-2.5.36/tests/test-bison-yylval/parser.y~ 2002-06-25 21:37:06.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylval/parser.y 2012-08-01 01:13:11.239867147 +0200
+@@ -25,6 +25,7 @@
+ How to compile:
+ bison --defines --output-file="parser.c" --name-prefix="test" parser.y
+ */
++%parse-param { void* scanner }
+ %{
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -32,11 +33,8 @@
+ #include "config.h"
+
+ #define YYERROR_VERBOSE 1
+-#define YYPARSE_PARAM scanner
+ #define YYLEX_PARAM scanner
+
+-int yyerror(char* msg);
+-
+
+ /* A dummy function. A check against seg-faults in yylval->str. */
+ int process_text(char* s) {
+@@ -76,7 +74,7 @@ starttag: LT TAGNAME GT { process_
+ endtag: LTSLASH TAGNAME GT { process_text($2);free($2);} ;
+ %%
+
+-int yyerror(char* msg) {
++int yyerror(void* scanner, char* msg) {
+ fprintf(stderr,"%s\n",msg);
+ return 0;
+ }
diff --git a/flex.spec b/flex.spec
index 0b6b831..fd07a00 100644
--- a/flex.spec
+++ b/flex.spec
@@ -1,15 +1,12 @@
Summary: A tool for creating scanners (text pattern recognizers)
Name: flex
-Version: 2.5.35
-Release: 16%{?dist}
+Version: 2.5.36
+Release: 1%{?dist}
License: BSD
Group: Development/Tools
URL: http://flex.sourceforge.net/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0: flex-2.5.35-sign.patch
-Patch1: flex-2.5.35-hardening.patch
-Patch2: flex-2.5.35-gcc44.patch
-Patch3: flex-2.5.35-missing-prototypes.patch
+Patch0: flex-2.5.36-bison-2.6.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: m4
BuildRequires: gettext bison m4
@@ -44,12 +41,20 @@ This package contains the library with default implementations of
`main' and `yywrap' functions that the client binary can choose to use
instead of implementing their own.
+%package doc
+Summary: Documentation for flex scanner generator
+Group: Documentation
+
+%description doc
+
+This package contains documentation for flex scanner generator in
+plain text and PDF formats.
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+
+%global flexdocdir %{_datadir}/doc/flex-doc-%{version}
%build
%configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -57,8 +62,9 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT docdir=%{flexdocdir} install
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT/%{flexdocdir}/{README.cvs,TODO}
( cd ${RPM_BUILD_ROOT}
ln -sf flex .%{_bindir}/lex
@@ -102,7 +108,19 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(-,root,root)
%{_libdir}/*.a
+%files doc
+%defattr(-,root,root)
+%{_datadir}/doc/flex-doc-%{version}
+
%changelog
+* Tue Jul 31 2012 Petr Machata <pmachata at redhat.com> - 2.5.36-1
+- Rebase to 2.5.36
+ - Drop flex-2.5.35-sign.patch, flex-2.5.35-hardening.patch,
+ flex-2.5.35-gcc44.patch, flex-2.5.35-missing-prototypes.patch
+ - Add flex-2.5.36-bison-2.6.1.patch
+ - Add a subpackage doc
+- Resolves #842073
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.35-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index c7265cd..78722ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10714e50cea54dc7a227e3eddcd44d57 flex-2.5.35.tar.bz2
+5e637290609fd3c2f1f2e75ac2bce1c5 flex-2.5.36.tar.bz2
More information about the scm-commits
mailing list