diff --git a/flex.spec b/flex.spec index 90a52a3..fdd19fb 100644 --- a/flex.spec +++ b/flex.spec @@ -3,13 +3,12 @@ Summary: A tool for generating 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: 7%{?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 @@ -19,9 +18,6 @@ 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 recognize lexical patterns in text. Flex takes pairs of regular @@ -65,12 +61,12 @@ libraries. Summary: Static libraries for the flex scanner generator # We renamed flex-static to flex-devel in version 2.5.35-15: Obsoletes: flex-static < 2.5.35-15 -Provides: flex-static = %{version}-%{release} +Provides: flex-static # 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-devel %description -n libfl-static @@ -80,8 +76,17 @@ 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 the flex scanner generator + +%description doc + +This package contains documentation for the flex scanner generator in +plain text and PDF formats. + %prep -%autosetup -p1 +%setup -q +%patch0 -p1 %build autoreconf -i @@ -92,7 +97,7 @@ 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} +rm -f $RPM_BUILD_ROOT/%{_pkgdocdir}/{README.cvs,TODO} # Exclude libtool archives (.la) as per Fedora packaging guidelines find %{buildroot} -name '*.la' -delete @@ -133,51 +138,10 @@ echo ============END TESTING=========== %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 diff --git a/plans/ci.fmf b/plans/ci.fmf index 3fd3ab7..1ad2c12 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,5 +1,6 @@ summary: CI Gating Plan discover: how: fmf + directory: tests execute: - how: tmt + how: beakerlib