Update License tag with build system licenses

Remove outdated tests.yml and replace it with FMF/TMT. The upstream
testsuite needed a build path fix and definition of pre-build variables.

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,2 +1,2 @@
-/m4-1.4.19.tar.xz
-/m4-1.4.19.tar.xz.sig
+/m4-1.4.20.tar.xz
+/m4-1.4.20.tar.xz.sig

gating.yaml

@@ -0,0 +1,7 @@
+--- !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}

m4.spec

@@ -1,8 +1,8 @@
 Summary: GNU macro processor
 Name: m4
-Version: 1.4.19
-Release: 12%{?dist}
-License: GPL-3.0-or-later AND GFDL-1.3-or-later
+Version: 1.4.20
+Release: 3%{?dist}
+License: GPL-3.0-or-later AND GFDL-1.3-or-later AND FSFULLR AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-or-later WITH Texinfo-exception AND GPL-2.0-or-later WITH Autoconf-exception-generic AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND MIT
 Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz
 Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig
 URL: https://www.gnu.org/software/m4/
@@ -31,24 +31,15 @@ Install m4 if you need a macro processor.
 chmod 644 COPYING
 
 %build
-# New m4 release requested:
-# https://lists.gnu.org/archive/html/m4-discuss/2025-02/msg00000.html
-export CFLAGS="${CFLAGS} -std=gnu17"
 %configure
 %make_build
 
 %install
-# New m4 release requested:
-# https://lists.gnu.org/archive/html/m4-discuss/2025-02/msg00000.html
-export CFLAGS="${CFLAGS} -std=gnu17"
 %make_install
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %find_lang %{name}
 
 %check
-# New m4 release requested:
-# https://lists.gnu.org/archive/html/m4-discuss/2025-02/msg00000.html
-export CFLAGS="${CFLAGS} -std=gnu17"
 make %{?_smp_mflags} check
 
 %files -f %{name}.lang
@@ -59,6 +50,15 @@ make %{?_smp_mflags} check
 %{_mandir}/man1/m4.1*
 
 %changelog
+* Fri Nov 14 2025 Florian Weimer  <fweimer@redhat.com> - 1.4.20-3
+- Update License tag with build system licenses
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon May 12 2025 Frédéric Bérat <fberat@redhat.com> - 1.4.20-1
+- Update to m4-1.4.20 (#2365446)
+
 * Tue Feb 04 2025 Frédéric Bérat <fberat@redhat.com> - 1.4.19-12
 - Add -std=gnu17 to CFLAGS to fix FTBFS until new m4 release gets out (#2340807)
 

plans/ci.fmf

@@ -0,0 +1,5 @@
+summary: CI Gating Plan
+discover:
+    how: fmf
+execute:
+    how: tmt

sources

@@ -1,2 +1,2 @@
-SHA512 (m4-1.4.19.tar.xz) = 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b
-SHA512 (m4-1.4.19.tar.xz.sig) = d6ac9c6a54c57e9b53fb3e34a60d49df2f46a6e494da0a0c9ae8246b984e68a853b5d8c42677c1a0485c3f36b0bce10a481d3775c0edc1dbdfb27b43545bc31e
+SHA512 (m4-1.4.20.tar.xz) = dc7b4f61452e564b095010029bf6ce4246e5a03959989cd76b09eb8012db7424c52819143020fab21a3471ff57ab026d3eccbd00dd3969819208980565a9fec0
+SHA512 (m4-1.4.20.tar.xz.sig) = bc75a64e47a87fe4073f26850a8344e82d15f156ac5b52cde1af701a0ba4e0d18f414323f86c868f114c4867b00c31ce205a9505343e588ad97825b05136c5eb

tests/tests.yml

@@ -1,16 +0,0 @@
----
-# Tests for Classic and Container
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    - container
-    tests:
-    - testsuite
-    required_packages:
-    - autoconf
-    - automake
-    - rpm-build
-    - wget
-

tests/testsuite/Makefile

@@ -53,7 +53,7 @@ $(METADATA): Makefile
 	@echo "Type:            Regression" >> $(METADATA)
 	@echo "TestTime:        3h" >> $(METADATA)
 	@echo "RunFor:          m4" >> $(METADATA)
-	@echo "Requires:        m4" >> $(METADATA)
+	@echo "Requires:        m4 rpm-build autoconf automake gettext gcc" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2+" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)

tests/testsuite/main.fmf

@@ -0,0 +1,17 @@
+summary: testsuite
+description: ''
+contact: Martin Cermak <mcermak@redhat.com>
+component:
+  - m4
+test: ./runtest.sh
+framework: beakerlib
+require:
+  - m4
+  - gcc
+  - rpm-build
+  - autoconf
+  - automake
+  - gettext
+duration: 3h
+extra-summary: /tools/m4/Regression/testsuite
+extra-task: /tools/m4/Regression/testsuite

tests/testsuite/runtest.sh

@@ -26,10 +26,10 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="m4"
+VERSION=$(rpm -q m4 --qf '%{VERSION}')
 
 rlJournalStart
     rlPhaseStartSetup
@@ -48,7 +48,8 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStart FAIL "Run tests"
-        rlRun "pushd $TMPD/BUILD/m4-*"
+        rlRun "pushd $TMPD/BUILD/m4-${VERSION}-build/m4-${VERSION}"
+        rlRun "eval `rpm --eval %___build_pre_env`"
         # el7 package creates couple tests/*log files (per testcase)
         # el6 package doesn't, so we'll create some explicitly
         rlRun "make check > tests/testout.log 2> tests/testerr.log"
@@ -61,7 +62,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStart FAIL "Check for no FAILed test"
-        rlRun "[[ $(cat tests/*log | grep -i FAIL | grep -P -v '^#' | wc -l) -eq 0 ]]"
+        rlRun "[[ $(cat tests/*log | grep FAIL | grep -P -v '^#' | wc -l) -eq 0 ]]"
     rlPhaseEnd
 
     rlPhaseStart FAIL "Show test results summary"