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/.gitignore b/.gitignore index 0414f17..e7cb9ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/m4-1.4.20.tar.xz -/m4-1.4.20.tar.xz.sig +/m4-1.4.18.tar.xz +/m4-1.4.18.tar.xz.sig diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 282e16b..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +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} diff --git a/m4.spec b/m4.spec index 7a38db8..5ea1b3a 100644 --- a/m4.spec +++ b/m4.spec @@ -1,14 +1,15 @@ -Summary: GNU macro processor +Summary: The GNU macro processor Name: m4 -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/ -BuildRequires: make -BuildRequires: gcc autoconf automake -BuildRequires: gettext +Version: 1.4.18 +Release: 6%{?dist} +License: GPLv3+ +Group: Applications/Text +Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz +Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig +URL: http://www.gnu.org/software/m4/ +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info +BuildRequires: autoconf automake %ifarch ppc ppc64 BuildRequires: texinfo %endif @@ -31,109 +32,37 @@ Install m4 if you need a macro processor. chmod 644 COPYING %build +autoreconf -ivf %configure -%make_build +make %{?_smp_mflags} %install -%make_install +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_infodir}/dir -%find_lang %{name} %check make %{?_smp_mflags} check -%files -f %{name}.lang +%files %license COPYING %doc AUTHORS ChangeLog NEWS README THANKS TODO %{_bindir}/m4 %{_infodir}/* %{_mandir}/man1/m4.1* +%post +if [ -f %{_infodir}/m4.info.gz ]; then # --excludedocs? + /sbin/install-info %{_infodir}/m4.info.gz %{_infodir}/dir || : +fi + +%preun +if [ "$1" = 0 ]; then + if [ -f %{_infodir}/m4.info.gz ]; then # --excludedocs? + /sbin/install-info --delete %{_infodir}/m4.info.gz %{_infodir}/dir || : + fi +fi + %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 - -* 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) - -* 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 - -* Thu Jan 25 2024 Fedora Release Engineering - 1.4.19-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.4.19-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Aug 08 2023 Frederic Berat - 1.4.19-7 -- Migrate to SPDX licenses (#2222092). - -* Thu Jul 20 2023 Fedora Release Engineering - 1.4.19-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.4.19-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 1.4.19-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.4.19-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.4.19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 31 2021 Vitezslav Crhonek - 1.4.19-1 -- Update to m4-1.4.19 - Resolves: #1965719 - -* Tue Jan 26 2021 Fedora Release Engineering - 1.4.18-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Oct 13 2020 Vitezslav Crhonek - 1.4.18-16 -- Drop workaround introduced in previous release - Resolves: #1864107 - -* Thu Aug 06 2020 Vitezslav Crhonek - 1.4.18-15 -- Disable %%check on ppc64le (workaround for FTBFS) - Resolves: #1864107 - -* Sat Aug 01 2020 Fedora Release Engineering - 1.4.18-14 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.4.18-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 1.4.18-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.4.18-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.4.18-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.4.18-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed May 02 2018 Vitezslav Crhonek - 1.4.18-8 -- Work around change in glibc - Resolves: #1573342 - -* Thu Feb 22 2018 Vitezslav Crhonek - 1.4.18-7 -- Add BuildRequires gcc -- Remove Group tag - * Thu Feb 08 2018 Fedora Release Engineering - 1.4.18-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild 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/sources b/sources index 17fc999..d65b454 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (m4-1.4.20.tar.xz) = dc7b4f61452e564b095010029bf6ce4246e5a03959989cd76b09eb8012db7424c52819143020fab21a3471ff57ab026d3eccbd00dd3969819208980565a9fec0 -SHA512 (m4-1.4.20.tar.xz.sig) = bc75a64e47a87fe4073f26850a8344e82d15f156ac5b52cde1af701a0ba4e0d18f414323f86c868f114c4867b00c31ce205a9505343e588ad97825b05136c5eb +SHA512 (m4-1.4.18.tar.xz) = 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174 +SHA512 (m4-1.4.18.tar.xz.sig) = effc857a19f1496d6dde2887c0314b37d4b142a435e77614936c730878c798491ad93b28860dddd2601f99a43fa41923729b961004faafc6f798f7bc1842f980 diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..fce17d1 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,16 @@ +--- +# 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 12f059c..d39ae45 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 rpm-build autoconf automake gettext gcc" >> $(METADATA) + @echo "Requires: m4" >> $(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 deleted file mode 100644 index bbdfc88..0000000 --- a/tests/testsuite/main.fmf +++ /dev/null @@ -1,17 +0,0 @@ -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 100755 new mode 100644 index 3f1f8b5..b45984a --- 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,8 +48,7 @@ rlJournalStart rlPhaseEnd rlPhaseStart FAIL "Run tests" - rlRun "pushd $TMPD/BUILD/m4-${VERSION}-build/m4-${VERSION}" - rlRun "eval `rpm --eval %___build_pre_env`" + rlRun "pushd $TMPD/BUILD/m4-*" # 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" @@ -62,7 +61,7 @@ rlJournalStart rlPhaseEnd rlPhaseStart FAIL "Check for no FAILed test" - rlRun "[[ $(cat tests/*log | grep FAIL | grep -P -v '^#' | wc -l) -eq 0 ]]" + rlRun "[[ $(cat tests/*log | grep -i FAIL | grep -P -v '^#' | wc -l) -eq 0 ]]" rlPhaseEnd rlPhaseStart FAIL "Show test results summary"