0003-backport-Fix-pattern-documentation-for-case-insensitive-ranges.patch

@@ -1,33 +0,0 @@
-From 38389534dabcf98bcbda70ef516c2b00f9ec67e9 Mon Sep 17 00:00:00 2001
-From: Martin Joerg <martin.joerg@gmail.com>
-Date: Mon, 27 Mar 2023 10:20:18 +0200
-Subject: [PATCH] Fix pattern documentation for case-insensitive ranges
-
----
- doc/flex.texi | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/flex.texi b/doc/flex.texi
-index bccab1e..acdd04c 100644
---- a/doc/flex.texi
-+++ b/doc/flex.texi
-@@ -952,13 +952,13 @@ character range such as @samp{[a-z]} or @samp{[S-W]} where it is obvious that yo
- want case-folding to occur. Here are some examples with the @samp{-i} flag
- enabled:
- 
--@multitable {@samp{[a-zA-Z]}} {ambiguous} {@samp{[A-Z\[\\\]_`a-t]}} {@samp{[@@A-Z\[\\\]_`abc]}}
-+@multitable {@samp{[a-zA-Z]}} {ambiguous} {@samp{[A-Z\[\\\]^_`a-t]}} {@samp{[@@A-Z\[\\\]^_`abc]}}
- @item Range @tab Result @tab Literal Range @tab Alternate Range
- @item @samp{[a-t]} @tab ok @tab @samp{[a-tA-T]} @tab
- @item @samp{[A-T]} @tab ok @tab @samp{[a-tA-T]} @tab
--@item @samp{[A-t]} @tab ambiguous @tab @samp{[A-Z\[\\\]_`a-t]} @tab @samp{[a-tA-T]}
-+@item @samp{[A-t]} @tab ambiguous @tab @samp{[A-Z\[\\\]^_`a-t]} @tab @samp{[a-tA-T]}
- @item @samp{[_-@{]} @tab ambiguous @tab @samp{[_`a-z@{]} @tab @samp{[_`a-zA-Z@{]}
--@item @samp{[@@-C]} @tab ambiguous @tab @samp{[@@ABC]} @tab @samp{[@@A-Z\[\\\]_`abc]}
-+@item @samp{[@@-C]} @tab ambiguous @tab @samp{[@@ABC]} @tab @samp{[@@A-Z\[\\\]^_`abc]}
- @end multitable
- 
- @cindex end of line, in negated character classes
--- 
-2.9.3.windows.1
-

0004-backport-fix-typo.patch

@@ -1,25 +0,0 @@
-From 9921366cfeea2a51eb06c825b486c078ddca2177 Mon Sep 17 00:00:00 2001
-From: "winter.loo" <adjkldd@126.com>
-Date: Sun, 2 Jul 2023 19:57:54 +0800
-Subject: [PATCH] doc: fix typo
-
----
- doc/flex.texi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/flex.texi b/doc/flex.texi
-index bccab1e..12b6b0d 100644
---- a/doc/flex.texi
-+++ b/doc/flex.texi
-@@ -4499,7 +4499,7 @@ when @code{%option bison-locations} (@samp{--bison-locations}) is specified:
- @end example
- 
- Support for yylval assumes that @code{YYSTYPE} is a valid type.  Support for
--yylloc assumes that @code{YYSLYPE} is a valid type.  Typically, these types are
-+yylloc assumes that @code{YYLTYPE} is a valid type.  Typically, these types are
- generated by @code{bison}, and are included in section 1 of the @code{flex}
- input.
- 
--- 
-2.9.3.windows.1
-

flex.spec

@@ -1,8 +1,8 @@
 Name: flex
 Version: 2.6.4
-Release: 8
+Release: 3
 Summary: A fast lexical analyzer generator
-License: BSD-3-Clause-flex AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-3.0-or-later WITH Texinfo-exception AND FSFAP AND FSFUL AND FSFULLR AND FSFULLRWD AND GPL-2.0-or-later AND X11
+License: BSD and LGPLv2+
 URL: https://github.com/westes/flex
 Source0: https://github.com/westes/flex/releases/download/v%{version}/flex-%{version}.tar.gz
 
@@ -17,11 +17,11 @@ Patch0007: scanner-temporarily-protect-against-ccl-overflow-ove.patch
 Patch0008: scanner-prevent-overflow-in-add_action.patch
 Patch0009: 0001-scanner-fix-default-of-yy_top_state.patch
 Patch0010: 0002-scanner-fix-default-of-yy_top_state.patch
-Patch0011: 0003-backport-Fix-pattern-documentation-for-case-insensitive-ranges.patch
-Patch0012: 0004-backport-fix-typo.patch
 
-BuildRequires: gcc gcc-c++ gettext help2man m4 bison texinfo automake autoconf
+BuildRequires: gcc gettext help2man m4 bison texinfo automake autoconf
 Requires: m4
+Requires(post): info
+Requires(preun): info
 
 %description
 Flex is a tool for generating scanners: programs which recognize lexical
@@ -57,56 +57,49 @@ autoreconf
 
 %install
 %make_install
-%delete_la
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-%find_lang %{name}
-
-rm -f %{buildroot}%{_infodir}/dir
-rm -f %{buildroot}%{_docdir}/%{name}/{AUTHORS,COPYING,ONEWS,NEWS,README.md}
 find %{buildroot} \( -name '*.la' -or -name '*.so' \) -delete
 find %{buildroot} \( -name '*.so.2' -or -name '*.so.2.0.0' \) -delete
 
-pushd ${RPM_BUILD_ROOT}
+cd ${RPM_BUILD_ROOT}
 ln -sf flex .%{_bindir}/lex
 ln -sf flex .%{_bindir}/flex++
 ln -s flex.1 .%{_mandir}/man1/lex.1
 ln -s flex.1 .%{_mandir}/man1/flex++.1
 ln -s libfl.a .%{_libdir}/libl.a
-popd
 
-%check
+%post
-%make_build check
+if [ -f %{_infodir}/flex.info.gz ]; then # for --excludedocs
+   /sbin/install-info %{_infodir}/flex.info.gz --dir-file=%{_infodir}/dir ||:
+fi
 
-%files -f %{name}.lang
+%preun
+if [ $1 = 0 ]; then
+    if [ -f %{_infodir}/flex.info.gz ]; then # for --excludedocs
+	/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir ||:
+    fi
+fi
+
+%files
+%{_datadir}/locale/*
+%dir %{_pkgdocdir}
 %license COPYING
+%{_pkgdocdir}/NEWS
+%{_pkgdocdir}/README.md
 %{_bindir}/*
 %{_includedir}/FlexLexer.h
+%{_infodir}/flex.info*
 
 %files devel
+%dir %{_pkgdocdir}
 %license COPYING
 %{_libdir}/*.a
 
 %files help
-%doc AUTHORS ONEWS NEWS README.md
+%{_pkgdocdir}
 %{_mandir}/man1/*
-%{_infodir}/flex.info*
 
 %changelog
-* Sat Aug 10 2024 Funda Wang <fundawang@yeah.net> - 2.6.4-8
-- cleanup spec
-
-* Fri Aug 9 2024 guojunding <guojunding@kylinos.cn> - 2.6.4-7
-- Fix typo
-
-* Tue Jul 30 2024 guojunding <guojunding@kylinos.cn> - 2.6.4-6
-- Fix pattern documentation for case-insensitive ranges
-
-* Tue Jul 12 2022 panxiaohe <panxh.life@foxmail.com> - 2.6.4-5
-- enable check test suite
-- delete duplicate package files: NEWS,README.md
-
-* Mon Jun 13 2022 panxiaohe <panxh.life@foxmail.com> - 2.6.4-4
-- modify license
-
 * Fri May 28 2021 yangzhuangzhuang<yangzhuangzhuang1@huawei.com> - 2.6.4-3
 - The autoreconf command is used during compilation.
   Therefore,the automake and autoconf compilation dependencies need to added.