Accepting request 506139 from home:AndreasStieger:branches:devel:tools:compiler

flex 2.6.4

OBS-URL: https://build.opensuse.org/request/show/506139
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/flex?expand=0&rev=26

baselibs.conf

@@ -1 +1,3 @@
 flex
+libfl2
+libfl-devel

flex-2.6.1-fPIC.patch

@@ -1,27 +0,0 @@
-Index: flex-2.6.1/src/Makefile.am
-===================================================================
---- flex-2.6.1.orig/src/Makefile.am
-+++ flex-2.6.1/src/Makefile.am
-@@ -8,8 +8,7 @@ m4 = @M4@
- bin_PROGRAMS = flex
- noinst_PROGRAMS = stage1flex
- lib_LTLIBRARIES = \
--	libfl.la \
--	libfl_pic.la
-+	libfl.la
- 
- stage1flex_SOURCES = \
- 	scan.l \
-@@ -49,12 +48,6 @@ libfl_la_SOURCES = \
- 
- libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- 
--libfl_pic_la_SOURCES = \
--	libmain.c \
--	libyywrap.c
--
--libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
--
- noinst_HEADERS = \
- 	flexdef.h \
- 	flexint.h \

flex-2.6.1.tar.xz

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

flex.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Sun Jun 25 19:34:29 UTC 2017 - astieger@suse.com
+
+- flex 2.6.4:
+  * Some minor performance enhancements
+  * honor user defined yy_* macros again
+- includes changes from 2.6.3:
+  * several bug fixes resolved problems introduced in recent flex
+    versions regarding processing of comments, literals and various
+    quoting scenarios.
+  * fix buffer overflow through long path (bsc#1026047)
+- includes changes from 2.6.2:
+  * a segfalt involving yyrestart(NULL) has been fixed
+  * flex should now handle quoting when mixed with m4 processing
+    correctly
+  * flex handles `[[' and `]]' correctly
+  * flex no longer generates non-ANSI code
+  * more compilation warnings were squashed in generated scanners
+  * prevented a buffer overflow that could occur when input buffers
+   were the exact wrong size
+- drop flex-2.6.1-fPIC.patch
+- build the shared library and split libfl
+
 -------------------------------------------------------------------
 Tue Feb  7 14:05:38 UTC 2017 - dimstar@opensuse.org
 

flex.spec

@@ -16,44 +16,55 @@
 #
 
 
+%define somajor 2
 Name:           flex
-#
+Version:        2.6.4
-Version:        2.6.1
 Release:        0
 Summary:        Fast Lexical Analyzer Generator
 License:        BSD-3-Clause
 Group:          Development/Languages/C and C++
 Url:            http://flex.sourceforge.net/
-Source:         https://github.com/westes/flex/releases/download/v%{version}/flex-%{version}.tar.xz
+Source:         https://github.com/westes/flex/releases/download/v%{version}/flex-%{version}.tar.gz
 Source1:        lex-wrapper.sh
 Source2:        README.SUSE
 Source3:        baselibs.conf
-Patch1:         flex-2.6.1-fPIC.patch
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  bison
 BuildRequires:  gcc-c++
-BuildRequires:  help2man
+BuildRequires:  m4
-BuildRequires:  libtool
+Requires(post): %{install_info_prereq}
-BuildRequires:  makeinfo
-Requires:       m4
 Requires(pre):  %{install_info_prereq}
-Requires(post):  %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 FLEX is a tool for generating scanners: programs that recognize lexical
 patterns in text.
 
+%package -n libfl-devel
+Summary:        Development files for flex
+Group:          Development/Languages/C and C++
+Requires:       libfl%{somajor} = %{version}
+
+%description -n libfl-devel
+FLEX is a tool for generating scanners: programs that recognize lexical
+patterns in text.
+
+This package contains files required to build programs with flex libraries.
+
+%package -n libfl%{somajor}
+Summary:        Libraries for flex
+Group:          Development/Languages/C and C++
+
+%description -n libfl%{somajor}
+FLEX is a tool for generating scanners: programs that recognize lexical
+patterns in text.
+
+This package contains libraries for using flex.
+
 %prep
 %setup -q
-%patch1 -p1
 
 %build
-autoreconf -fiv
 %configure \
-  --docdir=%{_docdir}/%{name} \
+  --docdir=%{_docdir}/%{name}
-  --disable-shared
 make %{?_smp_mflags}
 
 %check
@@ -77,16 +88,30 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %preun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
 
+%post   -n libfl%{somajor} -p /sbin/ldconfig
+%postun -n libfl%{somajor} -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING NEWS ONEWS README.md THANKS
 %{_bindir}/flex
 %{_bindir}/flex++
 %{_bindir}/lex
-%{_includedir}/FlexLexer.h
-%{_libdir}/libfl.a
 %{_mandir}/man1/flex.1%{ext_man}
 %{_mandir}/man1/lex.1%{ext_man}
 %{_infodir}/flex*
 %{_docdir}/%{name}
 
+%files -n libfl-devel
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING NEWS ONEWS README.md THANKS
+%{_includedir}/FlexLexer.h
+%{_libdir}/libfl.a
+%{_libdir}/libfl.so
+
+%files -n libfl%{somajor}
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING NEWS ONEWS README.md THANKS
+%{_libdir}/libfl.so.%{somajor}*
+
 %changelog