OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flex?expand=0&rev=3

flex-2.5.33-fPIC.patch

@@ -1,12 +0,0 @@
-Needed to link libfl.a into shared libraries
---- Makefile.am
-+++ Makefile.am
-@@ -73,6 +73,8 @@
- 	libmain.c \
- 	libyywrap.c
- 
-+libfl_a_CFLAGS = -fPIC
-+
- noinst_HEADERS = \
- 	flexdef.h \
- 	flexint.h \

flex-2.5.33.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:53b56a62ea9409b99b7a0ac4a5204fac16ca7eaf39b9374164c346d6badc6914
-size 695464

flex-2.5.34-doc-fix.diff

@@ -3,9 +3,14 @@ order (comapre with tables_shared.h).
 
 Andreas Gruenbacher <agruen@suse.de>
 
---- doc/flex.info-4
+---
-+++ doc/flex.info-4
+ doc/flex.info-1 |   16 ++++++++--------
-@@ -267,8 +267,8 @@
+ doc/flex.texi   |   14 +++++++-------
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+--- doc/flex.info-1.orig
++++ doc/flex.info-1
+@@ -4171,8 +4171,8 @@ indexed by name, as described below. The
                       +-------------------------------+
               Table 1 | uint16          td_id;        |
                       | uint16          td_flags;     |
@@ -15,7 +20,7 @@ Andreas Gruenbacher <agruen@suse.de>
                       | void            td_data[];    |
                       | uint8           td_pad64[];   |
                       +-------------------------------+
-@@ -399,12 +399,6 @@
+@@ -4303,12 +4303,6 @@ Fields of a table:
            elements or between structs.  The type of each member is
            determined by the `YYTD_DATA*' bits.
  
@@ -28,7 +33,7 @@ Andreas Gruenbacher <agruen@suse.de>
  `td_hilen'
       If `td_hilen' is non-zero, then the data is a two-dimensional
       array.  Otherwise, the data is a one-dimensional array. `td_hilen'
-@@ -420,11 +414,17 @@
+@@ -4324,11 +4318,17 @@ Fields of a table:
       simply skipped. Flex does not currently generate tables of zero
       length.
  
@@ -47,9 +52,9 @@ Andreas Gruenbacher <agruen@suse.de>
  
  `td_pad64[]'
       Zero or more NULL bytes, padding the entire table to the next
---- doc/flex.texi
+--- doc/flex.texi.orig
 +++ doc/flex.texi
-@@ -4984,8 +4984,8 @@
+@@ -5083,8 +5083,8 @@ indexed by name, as described below. The
                  +-------------------------------+
          Table 1 | uint16          td_id;        |
                  | uint16          td_flags;     |
@@ -59,7 +64,7 @@ Andreas Gruenbacher <agruen@suse.de>
                  | void            td_data[];    |
                  | uint8           td_pad64[];   |
                  +-------------------------------+
-@@ -5104,11 +5104,6 @@
+@@ -5203,11 +5203,6 @@ two integers. There is no padding betwee
  The type of each member is determined by the @code{YYTD_DATA*} bits.
  @end table
  
@@ -71,7 +76,7 @@ Andreas Gruenbacher <agruen@suse.de>
  @item td_hilen
  If @code{td_hilen} is non-zero, then the data is a two-dimensional array.
  Otherwise, the data is a one-dimensional array. @code{td_hilen} contains the
-@@ -5122,11 +5117,16 @@
+@@ -5221,11 +5216,16 @@ by the @code{td_flags} field.  It is pos
  array, and no data is loaded, i.e., this table is simply skipped. Flex does not
  currently generate tables of zero length.
  

flex-2.5.34-fPIC.patch

@@ -0,0 +1,34 @@
+We've been packaging an -fPIC enabled libfl.a since some time, switching to
+the new scheme is not worth it, package a libfl_pic.a -> libfl.a symlink
+instead.
+---
+ Makefile.am |   11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+--- Makefile.am.orig
++++ Makefile.am
+@@ -40,8 +40,7 @@ indent = @INDENT@
+ 
+ bin_PROGRAMS = flex
+ lib_LIBRARIES = \
+-	libfl.a \
+-	libfl_pic.a
++	libfl.a
+ 
+ flex_SOURCES = \
+ 	ccl.c \
+@@ -70,13 +69,7 @@ libfl_a_SOURCES = \
+ 	libmain.c \
+ 	libyywrap.c
+ 
+-libfl_pic_a_SOURCES = \
+-	libmain.c \
+-	libyywrap.c
+-
+-libfl_pic_a_CFLAGS =  \
+-	-fPIC         \
+-	$(AM_CFLAGS)
++libfl_a_CFLAGS = -fPIC $(AM_CFLAGS)
+ 
+ noinst_HEADERS = \
+ 	flexdef.h \

flex-2.5.35.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b
+size 1256501

flex.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Fri Feb 29 15:44:21 CET 2008 - mmarek@suse.cz
+
+- updated to 2.5.35
+  * includes previous fixes
+  * translation updates
+
+-------------------------------------------------------------------
+Tue Feb 19 11:19:58 CET 2008 - mmarek@suse.cz
+
+- updated with fixes from flex CVS to fix following bugs in 2.5.34:
+  #1849809, #1849805, #1628314, #1849812 (details at
+  http://sourceforge.net/tracker/?group_id=97492&atid=618177 )
+
+-------------------------------------------------------------------
+Tue Jan 15 14:55:38 CET 2008 - mmarek@suse.cz
+
+- updated to 2.5.34
+  * introduce yylex_init_extra; see the manual for details
+  * introduce %option extra-type="your_type *"
+  * The flex program now parses multiple short concatenated options
+    Thanks to Petr Machata of Red Hat on this issue.
+  * Expose YY_BUF_SIZE in the header file.
+  * pattern language expanded; see the manual for details on the
+    below highlights
+    * pattern options added to specify patterns as case-insensitive
+      or case-sensitive
+    * pattern options to specify whether the "." character should
+      match the newline character
+    * pattern options added to allow ignoring of whitespace in
+      patterns
+    * POSIX character classes may be negated in patterns
+    * patterns may now use set difference, union operators
+  * the manual now contains an appendix listing various common
+    patterns which may be useful when writing scanners
+  * c++ scanners can now use yywrap
+  * flex man page and flex manual in pdf now distributed in the
+    flex distribution
+  * bugfixes and translation updates
+
 -------------------------------------------------------------------
 Mon Mar 26 15:47:02 CEST 2007 - rguenther@suse.de
 

flex.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package flex (Version 2.5.33)
+# spec file for package flex (Version 2.5.35)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,23 +10,24 @@
 
 # norootforbuild
 
+
 Name:           flex
 BuildRequires:  bison gcc-c++ help2man
-URL:            http://flex.sourceforge.net/
+Url:            http://flex.sourceforge.net/
-License:        BSD License and BSD-like
+License:        BSD 3-Clause
 Group:          Development/Languages/C and C++
 Requires:       m4
 PreReq:         %install_info_prereq
-Autoreqprov:    on
+AutoReqProv:    on
-Version:        2.5.33
+Version:        2.5.35
-Release:        31
+Release:        2
 Summary:        Fast Lexical Analyzer Generator
 Source:         %{name}-%{version}.tar.bz2
 Source1:        lex-wrapper.sh
 Source2:        README.SUSE
-Patch1:         %{name}-%{version}-fPIC.patch
+Patch1:         flex-2.5.34-fPIC.patch
-Patch6:         %{name}-%{version}-yylineno.patch
+Patch2:         flex-2.5.33-yylineno.patch
-Patch8:         %{name}-%{version}-doc-fix.diff
+Patch3:         flex-2.5.34-doc-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -44,8 +45,10 @@ Authors:
 %prep
 %setup -q
 %patch1
-%patch6
+# Patch2 disabled for now, as the testsuite explicitly tests for yylineno in
-%patch8
+# all scanners. Let's see if the failing packages got fixed in the meantime.
+#patch2
+%patch3
 cp %{S:2} .
 
 %build
@@ -84,9 +87,40 @@ rm -rf $RPM_BUILD_ROOT
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %changelog
-* Mon Mar 26 2007 - rguenther@suse.de
+* Fri Feb 29 2008 mmarek@suse.cz
+- updated to 2.5.35
+  * includes previous fixes
+  * translation updates
+* Tue Feb 19 2008 mmarek@suse.cz
+- updated with fixes from flex CVS to fix following bugs in 2.5.34:
+  [#1849809], #1849805, #1628314, #1849812 (details at
+  http://sourceforge.net/tracker/?group_id=97492&atid=618177 )
+* Tue Jan 15 2008 mmarek@suse.cz
+- updated to 2.5.34
+  * introduce yylex_init_extra; see the manual for details
+  * introduce %%option extra-type="your_type *"
+  * The flex program now parses multiple short concatenated options
+  Thanks to Petr Machata of Red Hat on this issue.
+  * Expose YY_BUF_SIZE in the header file.
+  * pattern language expanded; see the manual for details on the
+  below highlights
+  * pattern options added to specify patterns as case-insensitive
+  or case-sensitive
+  * pattern options to specify whether the "." character should
+  match the newline character
+  * pattern options added to allow ignoring of whitespace in
+  patterns
+  * POSIX character classes may be negated in patterns
+  * patterns may now use set difference, union operators
+  * the manual now contains an appendix listing various common
+  patterns which may be useful when writing scanners
+  * c++ scanners can now use yywrap
+  * flex man page and flex manual in pdf now distributed in the
+  flex distribution
+  * bugfixes and translation updates
+* Mon Mar 26 2007 rguenther@suse.de
 - Add bison BuildRequires.
-* Wed May 17 2006 - mmarek@suse.cz
+* Wed May 17 2006 mmarek@suse.cz
 - update to 2.5.33
   * bugfix release
   * obsoleted patches:
@@ -96,71 +130,71 @@ rm -rf $RPM_BUILD_ROOT
     - keep-macros.patch
     - overflow.patch
   * kept fPIC.patch, yylineno.patch and doc-fix.diff
-* Tue May 16 2006 - agruen@suse.de
+* Tue May 16 2006 agruen@suse.de
 - A minor fix in the documentation.
-* Thu Mar 09 2006 - mmarek@suse.cz
+* Thu Mar 09 2006 mmarek@suse.cz
 - keep YY_* macros in the generated C file (backport from 2.5.33)
   [#141964#c6] (keep-yytext_ptr.patch -> keep-macros.patch)
-* Wed Mar 08 2006 - mmarek@suse.cz
+* Wed Mar 08 2006 mmarek@suse.cz
 - removed unneeded part of last fix (C++ scanners weren't affected)
   [#151087] (overflow.patch)
-* Fri Feb 17 2006 - mmarek@suse.cz
+* Fri Feb 17 2006 mmarek@suse.cz
 - fix buffer overflow in some generated scanners
   [#151087] (overflow.patch)
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Tue Dec 20 2005 - mmj@suse.de
+* Tue Dec 20 2005 mmj@suse.de
 - don't package /usr/share/info/dir
-* Thu Dec 15 2005 - mmarek@suse.cz
+* Thu Dec 15 2005 mmarek@suse.cz
 - added README.SUSE, packaged some %%doc files
-* Mon Dec 05 2005 - mmarek@suse.cz
+* Mon Dec 05 2005 mmarek@suse.cz
 - don't declare int yylineno in non-reentrant scanners without
   %%option yylineno -- programs declaring their own yylineno should
   build now
   (yylineno.patch)
-* Mon Nov 28 2005 - mmarek@suse.cz
+* Mon Nov 28 2005 mmarek@suse.cz
 - test-noansi-r didn't pass on 64bit, fix from CVS
   (YY_DECL.patch)
-* Tue Nov 22 2005 - mmarek@suse.cz
+* Tue Nov 22 2005 mmarek@suse.cz
 - update to version 2.5.31 once again...
-* Mon Nov 07 2005 - mmarek@suse.cz
+* Mon Nov 07 2005 mmarek@suse.cz
 - compile libfl.a with -fPIC
-* Sun Jan 11 2004 - adrian@suse.de
+* Sun Jan 11 2004 adrian@suse.de
 - add %%defattr
-* Mon Sep 15 2003 - tcrhak@suse.cz
+* Mon Sep 15 2003 tcrhak@suse.cz
 - Use <iostream> and std namespace in flex.skl [bug #30427]
-* Fri Aug 01 2003 - coolo@suse.de
+* Fri Aug 01 2003 coolo@suse.de
 - don't strip explicitly
-* Thu Apr 24 2003 - ro@suse.de
+* Thu Apr 24 2003 ro@suse.de
 - fix install_info --delete call and move from preun to postun
-* Fri Feb 07 2003 - ro@suse.de
+* Fri Feb 07 2003 ro@suse.de
 - added install_info macros
-* Tue Sep 17 2002 - ro@suse.de
+* Tue Sep 17 2002 ro@suse.de
 - removed bogus self-provides
-* Sat Jul 27 2002 - kukuk@suse.de
+* Sat Jul 27 2002 kukuk@suse.de
 - remove yacc from neededforbuild, bison is used
-* Wed Jun 26 2002 - tcrhak@suse.cz
+* Wed Jun 26 2002 tcrhak@suse.cz
 - update to 2.5.4a (slight change in license only)
 - bzipped sources
-* Tue Jan 08 2002 - schwab@suse.de
+* Tue Jan 08 2002 schwab@suse.de
 - Use <iostream> and std namespace in FlexLexer.h.
-* Tue Jul 31 2001 - nadvornik@suse.cz
+* Tue Jul 31 2001 nadvornik@suse.cz
 - installed info pages [bug #9566]
 - added buildroot
-* Wed Apr 11 2001 - nadvornik@suse.cz
+* Wed Apr 11 2001 nadvornik@suse.cz
 - declaration of isatty replaced with include<unistd.h>
-* Mon Apr 02 2001 - schwab@suse.de
+* Mon Apr 02 2001 schwab@suse.de
 - Don't try to forward declare class istream, just include <iostream.h>.
-* Tue Nov 21 2000 - kukuk@suse.de
+* Tue Nov 21 2000 kukuk@suse.de
 - Use macros to support multilib plattforms
-* Tue Apr 04 2000 - bk@suse.de
+* Tue Apr 04 2000 bk@suse.de
 - flex needs yacc for building on s390
-* Fri Feb 25 2000 - schwab@suse.de
+* Fri Feb 25 2000 schwab@suse.de
 - Specfile cleanup, get rid of Makefile.Linux
 - /usr/man -> /usr/share/man
 - Add group tag
 - Fix lex script
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
 - ran old prepare_spec on spec file to switch to new prepare_spec.
-* Thu Feb 06 1997 - rj@suse.de
+* Thu Feb 06 1997 rj@suse.de
 - new version 2.5.4