remove conflicting info dir file [release 2.6.4-6mamba;Thu Apr 18 2024]

flex-2.6.0-gcc-5.3.0-c-comment.patch

@@ -1,22 +0,0 @@
-From 07d89829cce4527c7614a34642d4b2c2ef5d6005 Mon Sep 17 00:00:00 2001
-From: Will Estes <westes575@gmail.com>
-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);

flex-2.6.4-glibc-2.26.patch

@@ -0,0 +1,14 @@
+diff -Nru flex-2.6.4.orig/configure.ac flex-2.6.4/configure.ac
+--- flex-2.6.4.orig/configure.ac	2017-10-16 23:01:23.000000000 +0200
++++ flex-2.6.4/configure.ac	2017-11-28 14:35:03.664347578 +0100
+@@ -25,8 +25,10 @@
+ # autoconf requirements and initialization
+ 
+ AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourceforge.net],[flex])
++AC_PREREQ([2.60])
+ AC_CONFIG_SRCDIR([src/scan.l])
+ AC_CONFIG_AUX_DIR([build-aux])
++AC_USE_SYSTEM_EXTENSIONS
+ LT_INIT
+ AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign check-news std-options dist-lzip parallel-tests subdir-objects])
+ AC_CONFIG_HEADER([src/config.h])

flex.spec

@@ -1,14 +1,15 @@
 Name:          flex
-Version:       2.6.2
+Epoch:         1
-Release:       1mamba
+Version:       2.6.4
+Release:       6mamba
 Summary:       A tool for creating scanners (loxical pattern recognizers)
 Group:         Development/Tools
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-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
 BuildRequires: glibc-devel
@@ -20,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.
@@ -44,18 +44,19 @@ This package contains shared libraries for %{name}.
 Group:         Development/Libraries
 Summary:       Development files for %{name}
 Requires:      libfl = %{?epoch:%epoch:}%{version}-%{release}
-## note: you can add this requirement if .pc files are provided by this package
-#Requires:      pkg-config
 
 %description -n libfl-devel
 This package contains libraries and header files for developing applications that use %{name}.
 
+%debug_package
+
 %prep
 %setup -q
-#%patch0 -p1
+%patch 1 -p1
+
+./autogen.sh
 
 %build
-./autogen.sh
 %configure
 %if "%{_host}" != "%{_build}"
 sed -i "/#define malloc rpl_malloc/d" config.h
@@ -68,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}
 
@@ -87,28 +89,44 @@ 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 <silvan.calarco@mambasoft.it> 2.6.4-6mamba
+- remove conflicting info dir file
+
+* Wed Apr 17 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 2.6.4-5mamba
+- URL updated (closes #1)
+
+* Fri Nov 27 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.6.4-4mamba
+- rebuilt with debug package
+
+* Tue Nov 28 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 2.6.4-3mamba
+- patched to fix segfault with glibc 2.26
+
+* Wed Oct 18 2017 Davide Madrisan <davide.madrisan@gmail.com> 2.6.4-2mamba
+- rebuild for removing the linker dependency to libc.so.6(GLIBC_2.26)
+
+* Mon Oct 16 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 2.6.4-1mamba
+- update to 2.6.4
+
+* Sat Dec 17 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.6.1-1mamba
+- downgrade to 2.6.1, 2.6.2 is too buggy, bump epoch
+
 * Sat Oct 29 2016 Automatic Build System <autodist@mambasoft.it> 2.6.2-1mamba
 - automatic version update by autodist