diff --git a/flex-2.6.0-gcc-5.3.0-c-comment.patch b/flex-2.6.0-gcc-5.3.0-c-comment.patch deleted file mode 100644 index 7417616..0000000 --- a/flex-2.6.0-gcc-5.3.0-c-comment.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 07d89829cce4527c7614a34642d4b2c2ef5d6005 Mon Sep 17 00:00:00 2001 -From: Will Estes -Date: Fri, 11 Dec 2015 09:45:14 -0500 -Subject: [PATCH] Commented in C style in skeleton; fixed sf#195 - ---- - src/flex.skl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/flex.skl b/src/flex.skl -index b63c8c8..40287b6 100644 ---- a/src/flex.skl -+++ b/src/flex.skl -@@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ -- num_to_alloc = 1; // After all that talk, this was set to 1 anyways... -+ num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ - YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - M4_YY_CALL_LAST_ARG); diff --git a/flex.spec b/flex.spec index 2a539b7..ae9d840 100644 --- a/flex.spec +++ b/flex.spec @@ -1,15 +1,14 @@ Name: flex Epoch: 1 Version: 2.6.4 -Release: 4mamba +Release: 6mamba Summary: A tool for creating scanners (loxical pattern recognizers) Group: Development/Tools Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://flex.sourceforge.net/ +URL: https://github.com/westes/flex Source: https://github.com/westes/flex.git/v%{version}/flex-%{version}.tar.bz2 -Patch0: flex-2.6.0-gcc-5.3.0-c-comment.patch Patch1: flex-2.6.4-glibc-2.26.patch License: BSD ## AUTOBUILDREQ-BEGIN @@ -22,7 +21,6 @@ BuildRequires: indent >= 2.2.9 BuildRequires: help2man >= 1.33.1 %endif Requires(post):%{__install_info} -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The flex program generates scanners. @@ -54,8 +52,8 @@ This package contains libraries and header files for developing applications tha %prep %setup -q -#%patch0 -p1 -%patch1 -p1 +%patch 1 -p1 + ./autogen.sh %build @@ -71,7 +69,8 @@ sed -i "/#define realloc rpl_realloc/d" config.h %makeinstall ln -s flex %{buildroot}/%{_bindir}/lex -#ln -s flex %{buildroot}/%{_bindir}/flex++ + +rm -f %{buildroot}%{_datadir}/info/dir %find_lang %{name} @@ -90,28 +89,29 @@ exit 0 %{_bindir}/flex %{_bindir}/flex++ %{_bindir}/lex -%{_datadir}/info/* +%{_datadir}/info/%{name}.info* %{_datadir}/man/man1/* %files -n libfl %defattr(-,root,root) %{_libdir}/libfl.so.* -#%{_libdir}/libfl_pic.so.* +%doc COPYING %files -n libfl-devel %defattr(-,root,root) %{_includedir}/FlexLexer.h %{_libdir}/libfl.a -%{_libdir}/libfl.la %{_libdir}/libfl.so -#%{_libdir}/libfl_pic.a -#%{_libdir}/libfl_pic.la -#%{_libdir}/libfl_pic.so %dir %{_datadir}/doc/flex %{_datadir}/doc/flex/* -#%doc COPYING NEWS README* TODO THANKS %changelog +* Thu Apr 18 2024 Silvan Calarco 2.6.4-6mamba +- remove conflicting info dir file + +* Wed Apr 17 2024 Silvan Calarco 2.6.4-5mamba +- URL updated (closes #1) + * Fri Nov 27 2020 Silvan Calarco 2.6.4-4mamba - rebuilt with debug package