From d2aebca4643abbf9e206e550b91cef129c9528a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:39:56 +0000 Subject: [PATCH 1/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index 23be7bc..ddfbeae 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL-3.0-or-later AND GFDL-1.3-or-later Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig @@ -50,6 +50,9 @@ make %{?_smp_mflags} check %{_mandir}/man1/m4.1* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.4.19-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 1.4.19-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e7e00ce157fb0647bd3989ee5ec1c2d0fe7532ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= Date: Tue, 4 Feb 2025 15:42:03 +0100 Subject: [PATCH 2/6] Set C standard to gnu17 A new m4 release would be needed in order to fix all issues related to GCC15 setting gnu23 the new standard for C. While the release has been requested, limit the standard to gnu17. --- m4.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index ddfbeae..1c54482 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL-3.0-or-later AND GFDL-1.3-or-later Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig @@ -31,15 +31,24 @@ 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 @@ -50,6 +59,9 @@ make %{?_smp_mflags} check %{_mandir}/man1/m4.1* %changelog +* Tue Feb 04 2025 Frédéric Bérat - 1.4.19-12 +- Add -std=gnu17 to CFLAGS to fix FTBFS until new m4 release gets out (#2340807) + * Fri Jan 17 2025 Fedora Release Engineering - 1.4.19-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From eb4498fb1dd61231ade9a0adddf098808aa4e207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= Date: Mon, 12 May 2025 15:11:55 +0200 Subject: [PATCH 3/6] Update to m4-1.4.20 The new release fixes the need for -std=gnu17 --- .gitignore | 4 ++-- m4.spec | 16 +++++----------- sources | 4 ++-- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index d21496e..0414f17 100644 --- a/.gitignore +++ b/.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 diff --git a/m4.spec b/m4.spec index 1c54482..d8a5d55 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 -Version: 1.4.19 -Release: 12%{?dist} +Version: 1.4.20 +Release: 1%{?dist} License: GPL-3.0-or-later AND GFDL-1.3-or-later Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig @@ -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,9 @@ make %{?_smp_mflags} check %{_mandir}/man1/m4.1* %changelog +* Mon May 12 2025 Frédéric Bérat - 1.4.20-1 +- Update to m4-1.4.20 (#2365446) + * Tue Feb 04 2025 Frédéric Bérat - 1.4.19-12 - Add -std=gnu17 to CFLAGS to fix FTBFS until new m4 release gets out (#2340807) diff --git a/sources b/sources index 85e8c27..17fc999 100644 --- a/sources +++ b/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 From af97130b57e2fbe18acc4162e95ddc3cf0d9ae5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:10:08 +0000 Subject: [PATCH 4/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index d8a5d55..5e2f7fd 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.20 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later AND GFDL-1.3-or-later Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig @@ -50,6 +50,9 @@ make %{?_smp_mflags} check %{_mandir}/man1/m4.1* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.4.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon May 12 2025 Frédéric Bérat - 1.4.20-1 - Update to m4-1.4.20 (#2365446) From 4387be6cd36318fe083df286aea3c0509f2b8ff4 Mon Sep 17 00:00:00 2001 From: Martin Coufal Date: Mon, 10 Nov 2025 13:00:48 +0100 Subject: [PATCH 5/6] Fix Fedora gating tests. 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 | 1 + gating.yaml | 7 +++++++ plans/ci.fmf | 5 +++++ tests/tests.yml | 16 ---------------- tests/testsuite/Makefile | 2 +- tests/testsuite/main.fmf | 17 +++++++++++++++++ tests/testsuite/runtest.sh | 7 ++++--- 7 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/ci.fmf delete mode 100644 tests/tests.yml create mode 100644 tests/testsuite/main.fmf mode change 100644 => 100755 tests/testsuite/runtest.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..282e16b --- /dev/null +++ b/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} diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..3fd3ab7 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,5 @@ +summary: CI Gating Plan +discover: + how: fmf +execute: + how: tmt diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index fce17d1..0000000 --- a/tests/tests.yml +++ /dev/null @@ -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 - diff --git a/tests/testsuite/Makefile b/tests/testsuite/Makefile index d39ae45..12f059c 100644 --- a/tests/testsuite/Makefile +++ b/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) diff --git a/tests/testsuite/main.fmf b/tests/testsuite/main.fmf new file mode 100644 index 0000000..bbdfc88 --- /dev/null +++ b/tests/testsuite/main.fmf @@ -0,0 +1,17 @@ +summary: testsuite +description: '' +contact: Martin Cermak +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 diff --git a/tests/testsuite/runtest.sh b/tests/testsuite/runtest.sh old mode 100644 new mode 100755 index b45984a..3f1f8b5 --- a/tests/testsuite/runtest.sh +++ b/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" From fa5dd6e32edd6f0f80696348950075e3af1491ec Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 14 Nov 2025 15:32:39 +0100 Subject: [PATCH 6/6] Update License tag with build system licenses --- m4.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/m4.spec b/m4.spec index 5e2f7fd..7a38db8 100644 --- a/m4.spec +++ b/m4.spec @@ -1,8 +1,8 @@ Summary: GNU macro processor Name: m4 Version: 1.4.20 -Release: 2%{?dist} -License: GPL-3.0-or-later AND GFDL-1.3-or-later +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/ @@ -50,6 +50,9 @@ make %{?_smp_mflags} check %{_mandir}/man1/m4.1* %changelog +* Fri Nov 14 2025 Florian Weimer - 1.4.20-3 +- Update License tag with build system licenses + * Thu Jul 24 2025 Fedora Release Engineering - 1.4.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild