Hello community, here is the log from the commit of package flex for openSUSE:Factory checked in at 2012-10-18 21:18:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flex (Old) and /work/SRC/openSUSE:Factory/.flex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flex", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/flex/flex.changes 2011-12-12 17:00:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.flex.new/flex.changes 2012-10-18 21:18:16.000000000 +0200 @@ -1,0 +2,27 @@ +Tue Oct 16 08:33:54 UTC 2012 - [email protected] + +- update to 2.5.37 + ** Import flex into git. See + git://flex.git.sourceforge.net/gitroot/flex/flex. + ** Fix make install target to not fail when the flex++ program is + already installed + ** New translations from the translation project: de, fi, pl, vi + ** various portability fixes that quiet compiler warnings on 64-bit + hosts + ** various manual fixes, including correcting the name of a %option and + updating some simple examples to use ANSI C syntax + ** various bug fixes that prevent certain error conditions from + persisting when they should not persist + ** improvements to the test suite so it behaves better when linking + compiled files + ** new translations from the translation project: ca, da, es, fi, fr, + ga, ko, pt_br, ro, ru, sv, tr, zh_cn + ** the flex distribution is now built with automake 1.10.1 and automake + 2.61 +- add patch flex-2.5.37-notex.patch to compile without texlive +- remove patches no longer required: + flex-2.5.33-yylineno.patch + flex-2.5.34-doc-fix.diff + flex-2.5.34-g++44.diff + +------------------------------------------------------------------- Old: ---- flex-2.5.33-yylineno.patch flex-2.5.34-asneeded.patch flex-2.5.34-doc-fix.diff flex-2.5.34-g++44.diff flex-2.5.35.tar.bz2 New: ---- flex-2.5.37-bison-2.6.1-1.patch flex-2.5.37-notex.patch flex-2.5.37.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flex.spec ++++++ --- /var/tmp/diff_new_pack.0MN9uO/_old 2012-10-18 21:18:22.000000000 +0200 +++ /var/tmp/diff_new_pack.0MN9uO/_new 2012-10-18 21:18:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package flex # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,14 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: flex BuildRequires: automake BuildRequires: bison BuildRequires: gcc-c++ BuildRequires: help2man +BuildRequires: makeinfo Url: http://flex.sourceforge.net/ -License: BSD-3-Clause -Group: Development/Languages/C and C++ Requires: m4 PreReq: %install_info_prereq # bug437293 @@ -30,18 +30,20 @@ Obsoletes: flex-64bit %endif # -Version: 2.5.35 +Version: 2.5.37 Release: 0 Summary: Fast Lexical Analyzer Generator -Source: %{name}-%{version}.tar.bz2 +License: BSD-3-Clause +Group: Development/Languages/C and C++ +Source: http://prdownloads.sourceforge.net/flex/flex-%{version}.tar.bz2 Source1: lex-wrapper.sh Source2: README.SUSE Source3: baselibs.conf Patch1: flex-2.5.34-fPIC.patch -Patch2: flex-2.5.33-yylineno.patch -Patch3: flex-2.5.34-doc-fix.diff -Patch4: flex-2.5.34-g++44.diff -Patch5: flex-2.5.34-asneeded.patch +# PATCH-FIX-OPENSUSE Remove tex dependency, info is enough for us, we don't need pdf - [email protected] +Patch2: flex-2.5.37-notex.patch +# PATCH-FIX-UPSTREAM fix tests for new bison +Patch3: http://www.linuxfromscratch.org/patches/lfs/7.2/flex-2.5.37-bison-2.6.1-1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,17 +53,12 @@ %prep %setup -q %patch1 -# Patch2 disabled for now, as the testsuite explicitly tests for yylineno in -# all scanners. Let's see if the failing packages got fixed in the meantime. -#patch2 -%patch3 -%patch4 -%patch5 -cp %{S:2} . +%patch2 -p1 +%patch3 -p1 %build autoreconf -fi -%configure +%configure --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %check @@ -72,8 +69,8 @@ %install make install DESTDIR=$RPM_BUILD_ROOT install %{S:1} $RPM_BUILD_ROOT/%{_bindir}/lex -ln -s flex $RPM_BUILD_ROOT/%{_bindir}/flex++ ln -s flex.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/lex.1.gz +cp %{S:2} $RPM_BUILD_ROOT/%{_docdir}/%{name} %find_lang %{name} %files -f %{name}.lang @@ -86,7 +83,7 @@ %{_mandir}/man1/flex.1.gz %{_mandir}/man1/lex.1.gz %{_infodir}/flex* -%doc README README.SUSE AUTHORS COPYING NEWS +%{_docdir}/%name %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz ++++++ flex-2.5.34-fPIC.patch ++++++ --- /var/tmp/diff_new_pack.0MN9uO/_old 2012-10-18 21:18:22.000000000 +0200 +++ /var/tmp/diff_new_pack.0MN9uO/_new 2012-10-18 21:18:22.000000000 +0200 @@ -5,6 +5,8 @@ Makefile.am | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) +Index: Makefile.am +=================================================================== --- Makefile.am.orig +++ Makefile.am @@ -40,8 +40,7 @@ indent = @INDENT@ @@ -17,7 +19,7 @@ flex_SOURCES = \ ccl.c \ -@@ -70,13 +69,7 @@ libfl_a_SOURCES = \ +@@ -73,13 +72,7 @@ libfl_a_SOURCES = \ libmain.c \ libyywrap.c ++++++ flex-2.5.37-bison-2.6.1-1.patch ++++++ Submitted By: Bruce Dubbs <[email protected]> Date: 2012-08-20 Initial Package Version: 2.5.36 Origin: Redhat Description: This fixes two errors in the regression tests due to changes in bison. 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,8 +21,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-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; } ++++++ flex-2.5.37-notex.patch ++++++ We don't need texlive in the core bootstrap cycle Index: flex-2.5.37/doc/Makefile.am =================================================================== --- flex-2.5.37.orig/doc/Makefile.am +++ flex-2.5.37/doc/Makefile.am @@ -2,7 +2,7 @@ help2man = @HELP2MAN@ info_TEXINFOS = flex.texi dist_man_MANS = flex.1 -dist_doc_DATA= flex.pdf +#dist_doc_DATA= flex.pdf CLEANFILES = \ flex.hks \ ++++++ flex-2.5.35.tar.bz2 -> flex-2.5.37.tar.bz2 ++++++ ++++ 74451 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
