diff --git a/baselibs.conf b/baselibs.conf index 11a57f8..36912b0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,3 @@ flex +libfl2 +libfl-devel diff --git a/flex-2.6.1-fPIC.patch b/flex-2.6.1-fPIC.patch deleted file mode 100644 index 8fe924f..0000000 --- a/flex-2.6.1-fPIC.patch +++ /dev/null @@ -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 \ diff --git a/flex-2.6.1.tar.xz b/flex-2.6.1.tar.xz deleted file mode 100644 index 78de032..0000000 --- a/flex-2.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f -size 835048 diff --git a/flex-2.6.4.tar.gz b/flex-2.6.4.tar.gz new file mode 100644 index 0000000..cff07a3 --- /dev/null +++ b/flex-2.6.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 +size 1419096 diff --git a/flex.changes b/flex.changes index 71e6d68..e91bbdf 100644 --- a/flex.changes +++ b/flex.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Jul 3 10:08:31 UTC 2017 - mpluskal@suse.com + +- Explicitly require m4 and library devel package +- Do not ship static library + +------------------------------------------------------------------- +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 diff --git a/flex.spec b/flex.spec index 32f58fc..eb19a7e 100644 --- a/flex.spec +++ b/flex.spec @@ -16,44 +16,57 @@ # +%define somajor 2 Name: flex -# -Version: 2.6.1 +Version: 2.6.4 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: libtool -BuildRequires: makeinfo +BuildRequires: m4 +Requires: libfl-devel = %{version} Requires: m4 +Requires(post): %{install_info_prereq} 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} \ - --disable-shared + --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %check @@ -63,12 +76,11 @@ make %{?_smp_mflags} check %install %make_install +find %{buildroot} -type f \( -name '*.a' -o -name '*.la' \) -delete -print install -D -p -m 0755 %{SOURCE1} %{buildroot}/%{_bindir}/lex install -D -p -m 0644 %{SOURCE2} %{buildroot}/%{_docdir}/flex/README.SUSE ln -s flex.1%{ext_man} %{buildroot}/%{_mandir}/man1/lex.1%{ext_man} -find %{buildroot} -type f -name "*.la" -delete -print - %find_lang %{name} %post @@ -77,16 +89,29 @@ 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.so + +%files -n libfl%{somajor} +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING NEWS ONEWS README.md THANKS +%{_libdir}/libfl.so.%{somajor}* + %changelog