Hello community, here is the log from the commit of package flex for openSUSE:Factory checked in at 2016-05-12 09:32:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flex (Old) and /work/SRC/openSUSE:Factory/.flex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flex" Changes: -------- --- /work/SRC/openSUSE:Factory/flex/flex.changes 2015-02-22 17:19:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.flex.new/flex.changes 2016-05-12 09:32:07.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Apr 26 09:26:03 UTC 2016 - idon...@suse.com + +- Update to version 2.6.1 + * A number of compiler warnings have been remedied. + * Line directives should now work as expected and be absent when + that is expected. + * Resolved github issues #53, #54, #55, #61. + * Resolved sf bugs #128, #129, #155, #160, #184, #187, #195. +- Refresh flex-2.5.34-fPIC.patch -> flex-2.6.1-fPIC.patch +- Drop upstream patches: config-guess-sub-update.patch, + flex-2.5.37-bison-2.6.1-1.patch, flex-compatible-with-bison3.patch, + flex-yyleng.patch +- Drop unneeded patch flex-2.5.37-notex.patch + +------------------------------------------------------------------- Old: ---- config-guess-sub-update.patch flex-2.5.34-fPIC.patch flex-2.5.37-bison-2.6.1-1.patch flex-2.5.37-notex.patch flex-2.5.37.tar.bz2 flex-compatible-with-bison3.patch flex-yyleng.patch New: ---- flex-2.6.1-fPIC.patch flex-2.6.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flex.spec ++++++ --- /var/tmp/diff_new_pack.CeX44G/_old 2016-05-12 09:32:08.000000000 +0200 +++ /var/tmp/diff_new_pack.CeX44G/_new 2016-05-12 09:32:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package flex # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,38 +17,26 @@ Name: flex -BuildRequires: automake -BuildRequires: bison -BuildRequires: gcc-c++ -BuildRequires: help2man -BuildRequires: makeinfo -Url: http://flex.sourceforge.net/ -Requires: m4 -PreReq: %install_info_prereq -# bug437293 -%ifarch ppc64 -Obsoletes: flex-64bit -%endif # -Version: 2.5.37 +Version: 2.6.1 Release: 0 Summary: Fast Lexical Analyzer Generator License: BSD-3-Clause Group: Development/Languages/C and C++ -Source: http://prdownloads.sourceforge.net/flex/flex-%{version}.tar.bz2 +Url: http://flex.sourceforge.net/ +Source: https://github.com/westes/flex/releases/download/v%{version}/flex-%{version}.tar.xz Source1: lex-wrapper.sh Source2: README.SUSE Source3: baselibs.conf -Patch1: flex-2.5.34-fPIC.patch -# PATCH-FIX-OPENSUSE Remove tex dependency, info is enough for us, we don't need pdf - co...@suse.de -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 -# PATCH-FIX-UPSTREAM flex-2.5.37-bison3.patch m...@suse.com - fix tests for bison3 -Patch4: flex-compatible-with-bison3.patch -Patch5: config-guess-sub-update.patch -# PATCH-FIX-UPSTREAM fix type of yyleng as mandated by POSIX (flex bug #187) -Patch6: flex-yyleng.patch +Patch1: flex-2.6.1-fPIC.patch +BuildRequires: automake +BuildRequires: bison +BuildRequires: gcc-c++ +BuildRequires: help2man +BuildRequires: libtool +BuildRequires: makeinfo +Requires: m4 +PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,46 +45,47 @@ %prep %setup -q -%patch1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -%patch6 -p1 +%patch1 -p1 %build autoreconf -fi -%configure --docdir=%{_docdir}/%{name} +%configure \ + --docdir=%{_docdir}/%{name} \ + --disable-shared make %{?_smp_mflags} %check %if !0%{?qemu_user_space_build:1} -make check +make %{?_smp_mflags} check %endif %install -make install DESTDIR=$RPM_BUILD_ROOT -install %{S:1} $RPM_BUILD_ROOT/%{_bindir}/lex -ln -s flex.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/lex.1.gz -cp %{S:2} $RPM_BUILD_ROOT/%{_docdir}/%{name} +make %{?_smp_mflags} DESTDIR=%{buildroot} install +install %{SOURCE1} %{buildroot}/%{_bindir}/lex +ln -s flex.1.gz %{buildroot}/%{_mandir}/man1/lex.1.gz +cp %{SOURCE2} %{buildroot}/%{_docdir}/%{name} + +find %{buildroot} -name *.la -delete + %find_lang %{name} %files -f %{name}.lang + %defattr(-,root,root) -/usr/bin/flex -/usr/bin/flex++ -/usr/bin/lex -/usr/include/FlexLexer.h +%{_bindir}/flex +%{_bindir}/flex++ +%{_bindir}/lex +%{_includedir}/FlexLexer.h %{_libdir}/libfl.a %{_mandir}/man1/flex.1.gz %{_mandir}/man1/lex.1.gz %{_infodir}/flex* -%{_docdir}/%name +%{_docdir}/%{name} %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%postun +%preun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog ++++++ flex-2.5.34-fPIC.patch -> flex-2.6.1-fPIC.patch ++++++ --- /work/SRC/openSUSE:Factory/flex/flex-2.5.34-fPIC.patch 2012-10-18 21:18:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.flex.new/flex-2.6.1-fPIC.patch 2016-05-12 09:32:07.000000000 +0200 @@ -1,36 +1,27 @@ -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(-) - -Index: Makefile.am +Index: flex-2.6.1/src/Makefile.am =================================================================== ---- Makefile.am.orig -+++ Makefile.am -@@ -40,8 +40,7 @@ indent = @INDENT@ - +--- flex-2.6.1.orig/src/Makefile.am ++++ flex-2.6.1/src/Makefile.am +@@ -8,8 +8,7 @@ m4 = @M4@ bin_PROGRAMS = flex - lib_LIBRARIES = \ -- libfl.a \ -- libfl_pic.a -+ libfl.a + noinst_PROGRAMS = stage1flex + lib_LTLIBRARIES = \ +- libfl.la \ +- libfl_pic.la ++ libfl.la + + stage1flex_SOURCES = \ + scan.l \ +@@ -49,12 +48,6 @@ libfl_la_SOURCES = \ - flex_SOURCES = \ - ccl.c \ -@@ -73,13 +72,7 @@ libfl_a_SOURCES = \ - libmain.c \ - libyywrap.c + libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ --libfl_pic_a_SOURCES = \ +-libfl_pic_la_SOURCES = \ - libmain.c \ - libyywrap.c - --libfl_pic_a_CFLAGS = \ -- -fPIC \ -- $(AM_CFLAGS) -+libfl_a_CFLAGS = -fPIC $(AM_CFLAGS) - +-libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +- noinst_HEADERS = \ flexdef.h \ + flexint.h \
