diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/flex.spec b/flex.spec index 90a52a3..a7fffe5 100644 --- a/flex.spec +++ b/flex.spec @@ -1,15 +1,14 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -Summary: A tool for generating scanners (text pattern recognizers) +Summary: A tool for creating scanners (text pattern recognizers) Name: flex Version: 2.6.4 -Release: 20%{?dist} - -# An SPDX license string check done against flex-2.6.4 using fossology -# found strings corresponding to the licenses noted below across the flex -# source tree. -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 - +Release: 2%{?dist} +# parse.c and parse.h are under GPLv3+ with exception which allows +# relicensing. Since flex is shipped under BDS-style license, +# let's assume that the relicensing was done. +# gettext.h (copied from gnulib) is under LGPLv2+ +License: BSD and LGPLv2+ URL: https://github.com/westes/flex Source: https://github.com/westes/flex/releases/download/v%{version}/flex-%{version}.tar.gz @@ -17,10 +16,6 @@ Patch0: flex-rh1389575.patch Requires: m4 BuildRequires: gettext gettext-devel bison m4 help2man gcc gcc-c++ automake libtool -BuildRequires: make - -Obsoletes: flex-doc < 2.6.4-8 -Provides: flex-doc = %{version}-%{release} %description The flex program generates scanners. Scanners are programs which can @@ -38,50 +33,28 @@ application development. # We keep the libraries in separate sub-package to allow for multilib # installations of flex. - -%define somajor 2 - -%package -n libfl%{somajor} -Summary: Libraries for the flex scanner generator - -%description -n libfl%{somajor} -flex is a tool for generating scanners. - -This package contains the shared library with default implementations of -`main' and `yywrap' functions that binaries using flex can choose to link -against instead of implementing on their own. - -%package -n libfl-devel -Summary: Development files for the flex scanner generator -Requires: libfl%{somajor} = %{version}-%{release} - -%description -n libfl-devel -flex is a tool for generating scanners. - -This package contains files required to build programs that use flex -libraries. - -%package -n libfl-static -Summary: Static libraries for the flex scanner generator -# We renamed flex-static to flex-devel in version 2.5.35-15: +%package devel +Summary: Libraries for flex scanner generator Obsoletes: flex-static < 2.5.35-15 -Provides: flex-static = %{version}-%{release} -# We renamed flex-devel to libfl-static in version 2.6.4-6. This clarifies -# the nature of the package and brings us in line with naming used by SUSE -# and Debian: -Obsoletes: flex-devel < 2.6.4-6 -Provides: flex-devel = %{version}-%{release} +Provides: flex-static -%description -n libfl-static +%description devel -flex is a tool for generating scanners. +This package contains the library with default implementations of +`main' and `yywrap' functions that the client binary can choose to use +instead of implementing their own. -This package contains the static library with default implementations of -`main' and `yywrap' functions that binaries using flex can choose to -statically link against instead of implementing their own. +%package doc +Summary: Documentation for flex scanner generator + +%description doc + +This package contains documentation for flex scanner generator in +plain text and PDF formats. %prep -%autosetup -p1 +%setup -q +%patch0 -p1 %build autoreconf -i @@ -92,9 +65,16 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_infodir}/dir -rm -f $RPM_BUILD_ROOT/%{_pkgdocdir}/{README.cvs,TODO,AUTHORS,COPYING,ONEWS} -# Exclude libtool archives (.la) as per Fedora packaging guidelines +rm -f $RPM_BUILD_ROOT/%{_pkgdocdir}/{README.cvs,TODO} +# For now, excluding the new .la and .so files as we haven't had +# any requests for them and adding them will require a new subpackage. +# The .so files contain 2 optional implementations of main and yywrap +# for developer convenience. They are also available in the .a file +# provided in flex-devel. find %{buildroot} -name '*.la' -delete +find %{buildroot} -name '*.so' -delete +find %{buildroot} -name '*.so.2' -delete +find %{buildroot} -name '*.so.2.0.0' -delete ( cd ${RPM_BUILD_ROOT} ln -sf flex .%{_bindir}/lex @@ -121,82 +101,15 @@ echo ============END TESTING=========== %{_includedir}/FlexLexer.h %{_infodir}/flex.info* -%files -n libfl%{somajor} -%{_libdir}/libfl.so.%{somajor}* - -%files -n libfl-devel -%{_includedir}/FlexLexer.h -%{_libdir}/libfl.so - -%files -n libfl-static +%files devel %dir %{_pkgdocdir} %license COPYING %{_libdir}/*.a +%files doc +%{_pkgdocdir} + %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 2.6.4-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 2.6.4-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 2.6.4-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Apr 23 2024 Arjun Shankar - 2.6.4-17 -- Provide flex-doc via the main flex package - -* Wed Jan 24 2024 Fedora Release Engineering - 2.6.4-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.6.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Oct 30 2023 Arjun Shankar - 2.6.4-14 -- Analyse flex sources for license information -- Migrate License field to SPDX identifiers for - https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 - (#2222083) - -* Wed Jul 19 2023 Fedora Release Engineering - 2.6.4-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 2.6.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.6.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 2.6.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.6.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu May 06 2021 Arjun Shankar - 2.6.4-8 -- Remove and obsolete the flex-doc subpackage; documention is provided in the - main package itself -- Specify versions in "Provides:" lines for flex-static and flex-devel - -* Tue Jan 26 2021 Fedora Release Engineering - 2.6.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Aug 21 2020 Arjun Shankar - 2.6.4-6 -- Re-work flex subpackages and provide shared libraries (#1327851): -- Remove and obsolete the flex-devel subpackage containing static libraries -- Provide shared libraries in a new subpackage named libfl2 -- Provide development files in a new subpackage named libfl-devel -- Provide static libraries in a new subpackage named libfl-static - -* Mon Jul 27 2020 Fedora Release Engineering - 2.6.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 2.6.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2.6.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Thu Jan 31 2019 Fedora Release Engineering - 2.6.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index ce3cdc1..0000000 --- a/gating.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf deleted file mode 100644 index 3fd3ab7..0000000 --- a/plans/ci.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: CI Gating Plan -discover: - how: fmf -execute: - how: tmt diff --git a/tests/Sanity/smoke-check-flex-runs/Makefile b/tests/Sanity/smoke-check-flex-runs/Makefile deleted file mode 100644 index 3abe871..0000000 --- a/tests/Sanity/smoke-check-flex-runs/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/flex/Sanity/smoke-check-flex-runs -# Description: Show your version. Build a one-file project. -# Author: Vaclav Kadlcik -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2015 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/tools/flex/Sanity/smoke-check-flex-runs -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE count_chars_and_lines.l calc-lexer.l calc-grammar.y expected_calc_output.txt - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Vaclav Kadlcik " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Show your version. Build a one-file project." >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 15m" >> $(METADATA) - @echo "RunFor: flex" >> $(METADATA) - @echo "Requires: flex bison gcc" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Sanity/smoke-check-flex-runs/PURPOSE b/tests/Sanity/smoke-check-flex-runs/PURPOSE deleted file mode 100644 index ed0f21f..0000000 --- a/tests/Sanity/smoke-check-flex-runs/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /tools/flex/Sanity/smoke-check-flex-runs -Description: Show your version. Build a one-file project. -Author: Vaclav Kadlcik diff --git a/tests/Sanity/smoke-check-flex-runs/calc-grammar.y b/tests/Sanity/smoke-check-flex-runs/calc-grammar.y deleted file mode 100644 index 53d4a85..0000000 --- a/tests/Sanity/smoke-check-flex-runs/calc-grammar.y +++ /dev/null @@ -1,36 +0,0 @@ -%{ -#include -%} - -%token NUMBER -%token ADD SUB MUL DIV -%token EOL - -%% - -input: - | input EOL { } - | input expression EOL { printf("%d\n", $2); } - ; - -expression: - factor - | expression ADD factor { $$ = $1 + $3; } - | expression SUB factor { $$ = $1 - $3; } - ; - -factor: - NUMBER - | factor MUL NUMBER { $$ = $1 * $3; } - | factor DIV NUMBER { $$ = $1 / $3; } - ; - -%% - -int main(int argc, char ** argv) { - yyparse(); -} - -yyerror(char *s) { - fprintf(stderr, "ERROR: %s\n", s); -} diff --git a/tests/Sanity/smoke-check-flex-runs/calc-lexer.l b/tests/Sanity/smoke-check-flex-runs/calc-lexer.l deleted file mode 100644 index fa9ac41..0000000 --- a/tests/Sanity/smoke-check-flex-runs/calc-lexer.l +++ /dev/null @@ -1,15 +0,0 @@ -%option noyywrap -%{ -#include "calc-grammar.tab.h" -%} - -%% -"+" { return ADD; } -"-" { return SUB; } -"*" { return MUL; } -"/" { return DIV; } -[0-9]+ { yylval = atoi(yytext); return NUMBER; } -\n { return EOL; } -[ \t] { /* ignore whitespaces */ } -. { yyerror("unexpected character %c", *yytext); } -%% diff --git a/tests/Sanity/smoke-check-flex-runs/count_chars_and_lines.l b/tests/Sanity/smoke-check-flex-runs/count_chars_and_lines.l deleted file mode 100644 index 7b90045..0000000 --- a/tests/Sanity/smoke-check-flex-runs/count_chars_and_lines.l +++ /dev/null @@ -1,21 +0,0 @@ -%option noyywrap -%{ -#include - -int chars = 0; -int lines = 0; -%} - -%% - -\n { lines++; chars++; } -. { chars++; } - -%% - -int main(int argc, char ** argv) { - yylex(); - printf("chars: %d\n", chars); - printf("lines: %d\n", lines); - return 0; -} diff --git a/tests/Sanity/smoke-check-flex-runs/expected_calc_output.txt b/tests/Sanity/smoke-check-flex-runs/expected_calc_output.txt deleted file mode 100644 index 7baa841..0000000 --- a/tests/Sanity/smoke-check-flex-runs/expected_calc_output.txt +++ /dev/null @@ -1,3 +0,0 @@ -STDOUT: 7 -STDOUT: -221 -STDOUT: 42 diff --git a/tests/Sanity/smoke-check-flex-runs/main.fmf b/tests/Sanity/smoke-check-flex-runs/main.fmf deleted file mode 100644 index 2b25e69..0000000 --- a/tests/Sanity/smoke-check-flex-runs/main.fmf +++ /dev/null @@ -1,15 +0,0 @@ -summary: Show your version. Build a one-file project. -description: '' -contact: -- Vaclav Kadlcik -component: -- flex -test: ./runtest.sh -framework: beakerlib -recommend: -- flex -- bison -- gcc -duration: 15m -extra-summary: /tools/flex/Sanity/smoke-check-flex-runs -extra-task: /tools/flex/Sanity/smoke-check-flex-runs diff --git a/tests/Sanity/smoke-check-flex-runs/runtest.sh b/tests/Sanity/smoke-check-flex-runs/runtest.sh deleted file mode 100755 index 68ee8a3..0000000 --- a/tests/Sanity/smoke-check-flex-runs/runtest.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/flex/Sanity/smoke-check-flex-runs -# Description: Show your version. Build a one-file project. -# Author: Vaclav Kadlcik -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2015 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="flex" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - yum -y install bison gcc - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "cp count_chars_and_lines.l calc-lexer.l calc-grammar.y expected_calc_output.txt $TmpDir" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest 'Show version' - - rlRun -t -s 'flex -V' - rlAssertNotGrep '^STDERR:' $rlRun_LOG - rlAssertGrep '^STDOUT: flex [0-9]' $rlRun_LOG - - rlPhaseEnd - - rlPhaseStartTest 'Flex works standalone' - - rlRun 'flex -o count_chars_and_lines.c count_chars_and_lines.l' - rlRun 'gcc -o count_chars_and_lines count_chars_and_lines.c' - rlAssertExists 'count_chars_and_lines' - rlRun -t -s 'echo -e "nazdar\nbazar" | ./count_chars_and_lines' - rlAssertNotGrep '^STDERR:' $rlRun_LOG - rlAssertGrep '^STDOUT: chars: 13$' $rlRun_LOG - rlAssertGrep '^STDOUT: lines: 2$' $rlRun_LOG - - rlPhaseEnd - - rlPhaseStartTest 'Flex works with Bison' - - rlRun 'bison -d calc-grammar.y' - rlRun 'flex calc-lexer.l' - rlRun 'gcc -o calc calc-grammar.tab.c lex.yy.c' - rlAssertExists 'calc' - rlRun -t -s 'echo -e "1 + 2 * 3\n1 - 666 / 3\n42" | ./calc' - rlAssertNotDiffer expected_calc_output.txt $rlRun_LOG - - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd