From d9c380b5e895cc95250fdbbdad58f3a4c0072f3c Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 13 Oct 2020 11:22:19 +0200 Subject: [PATCH 01/20] Drop workaround introduced in previous release --- m4.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/m4.spec b/m4.spec index 3d37cc1..810f91a 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: The GNU macro processor Name: m4 Version: 1.4.18 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv3+ Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig @@ -41,9 +41,7 @@ autoreconf -ivf rm -f $RPM_BUILD_ROOT%{_infodir}/dir %check -%ifnarch ppc64le make %{?_smp_mflags} check -%endif %files %license COPYING @@ -53,6 +51,10 @@ make %{?_smp_mflags} check %{_mandir}/man1/m4.1* %changelog +* 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 From abaf7b6606e48baf8c17af572c8e186658ce74f6 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 03:11:39 +0000 Subject: [PATCH 02/20] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- m4.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/m4.spec b/m4.spec index 810f91a..865917b 100644 --- a/m4.spec +++ b/m4.spec @@ -8,6 +8,7 @@ Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig # Patch0: update to glibc libio.h removal, rhbz#1573342 Patch0: m4-1.4.18-glibc-change-work-around.patch URL: http://www.gnu.org/software/m4/ +BuildRequires: make BuildRequires: gcc autoconf automake %ifarch ppc ppc64 BuildRequires: texinfo From 693395760c67864c565c33ab4c85304c71e3038f Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 18 Jan 2021 01:40:29 +0000 Subject: [PATCH 03/20] Update URLs to HTTPS --- m4.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/m4.spec b/m4.spec index 865917b..ce6c063 100644 --- a/m4.spec +++ b/m4.spec @@ -1,13 +1,13 @@ -Summary: The GNU macro processor +Summary: GNU macro processor Name: m4 Version: 1.4.18 Release: 16%{?dist} License: GPLv3+ -Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz -Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig +Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz +Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig # Patch0: update to glibc libio.h removal, rhbz#1573342 Patch0: m4-1.4.18-glibc-change-work-around.patch -URL: http://www.gnu.org/software/m4/ +URL: https://www.gnu.org/software/m4/ BuildRequires: make BuildRequires: gcc autoconf automake %ifarch ppc ppc64 From dec446dc1dd93424347572db6f35d406ae39d1af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 19:06:16 +0000 Subject: [PATCH 04/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index ce6c063..89ba8cb 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.18 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv3+ Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig @@ -52,6 +52,9 @@ make %{?_smp_mflags} check %{_mandir}/man1/m4.1* %changelog +* 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 From 745918953c85152945294f508708e91c06fc7953 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 1 Jun 2021 10:50:07 +0200 Subject: [PATCH 05/20] Update to m4-1.4.19 --- .gitignore | 4 +- m4-1.4.18-glibc-change-work-around.patch | 115 ----------------------- m4.spec | 16 ++-- sources | 4 +- 4 files changed, 13 insertions(+), 126 deletions(-) delete mode 100644 m4-1.4.18-glibc-change-work-around.patch diff --git a/.gitignore b/.gitignore index e7cb9ae..d21496e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/m4-1.4.18.tar.xz -/m4-1.4.18.tar.xz.sig +/m4-1.4.19.tar.xz +/m4-1.4.19.tar.xz.sig diff --git a/m4-1.4.18-glibc-change-work-around.patch b/m4-1.4.18-glibc-change-work-around.patch deleted file mode 100644 index 582ae9b..0000000 --- a/m4-1.4.18-glibc-change-work-around.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -up m4-1.4.18/lib/fflush.c.orig m4-1.4.18/lib/fflush.c ---- m4-1.4.18/lib/fflush.c.orig 2018-05-02 12:35:59.536851666 +0200 -+++ m4-1.4.18/lib/fflush.c 2018-05-02 12:37:02.768958606 +0200 -@@ -33,7 +33,7 @@ - #undef fflush - - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - -diff -up m4-1.4.18/lib/fpending.c.orig m4-1.4.18/lib/fpending.c ---- m4-1.4.18/lib/fpending.c.orig 2018-05-02 12:35:32.305806774 +0200 -+++ m4-1.4.18/lib/fpending.c 2018-05-02 12:35:44.944827347 +0200 -@@ -32,7 +32,7 @@ __fpending (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return fp->_IO_write_ptr - fp->_IO_write_base; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -diff -up m4-1.4.18/lib/fpurge.c.orig m4-1.4.18/lib/fpurge.c ---- m4-1.4.18/lib/fpurge.c.orig 2018-05-02 12:38:13.586078669 +0200 -+++ m4-1.4.18/lib/fpurge.c 2018-05-02 12:38:38.785121867 +0200 -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ -diff -up m4-1.4.18/lib/freadahead.c.orig m4-1.4.18/lib/freadahead.c ---- m4-1.4.18/lib/freadahead.c.orig 2016-12-31 14:54:41.000000000 +0100 -+++ m4-1.4.18/lib/freadahead.c 2018-05-02 11:43:19.570336724 +0200 -@@ -25,7 +25,7 @@ - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) -diff -up m4-1.4.18/lib/freading.c.orig m4-1.4.18/lib/freading.c ---- m4-1.4.18/lib/freading.c.orig 2018-05-02 12:37:33.970011368 +0200 -+++ m4-1.4.18/lib/freading.c 2018-05-02 12:37:59.393054359 +0200 -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); -diff -up m4-1.4.18/lib/fseeko.c.orig m4-1.4.18/lib/fseeko.c ---- m4-1.4.18/lib/fseeko.c.orig 2018-05-02 11:44:17.947460233 +0200 -+++ m4-1.4.18/lib/fseeko.c 2018-05-02 12:39:49.537216897 +0200 -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -diff -up m4-1.4.18/lib/stdio-impl.h.orig m4-1.4.18/lib/stdio-impl.h ---- m4-1.4.18/lib/stdio-impl.h.orig 2016-12-31 14:54:42.000000000 +0100 -+++ m4-1.4.18/lib/stdio-impl.h 2018-05-02 11:43:19.570336724 +0200 -@@ -18,6 +18,12 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - diff --git a/m4.spec b/m4.spec index 89ba8cb..8a04bdf 100644 --- a/m4.spec +++ b/m4.spec @@ -1,15 +1,14 @@ Summary: GNU macro processor Name: m4 -Version: 1.4.18 -Release: 17%{?dist} +Version: 1.4.19 +Release: 1%{?dist} License: GPLv3+ Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig -# Patch0: update to glibc libio.h removal, rhbz#1573342 -Patch0: m4-1.4.18-glibc-change-work-around.patch URL: https://www.gnu.org/software/m4/ BuildRequires: make BuildRequires: gcc autoconf automake +BuildRequires: gettext %ifarch ppc ppc64 BuildRequires: texinfo %endif @@ -29,22 +28,21 @@ Install m4 if you need a macro processor. %prep %setup -q -%patch0 -p1 -b .glibc-change-work-around chmod 644 COPYING %build -autoreconf -ivf %configure %make_build %install %make_install rm -f $RPM_BUILD_ROOT%{_infodir}/dir +%find_lang %{name} %check make %{?_smp_mflags} check -%files +%files -f %{name}.lang %license COPYING %doc AUTHORS ChangeLog NEWS README THANKS TODO %{_bindir}/m4 @@ -52,6 +50,10 @@ make %{?_smp_mflags} check %{_mandir}/man1/m4.1* %changelog +* 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 diff --git a/sources b/sources index d65b454..85e8c27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (m4-1.4.18.tar.xz) = 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174 -SHA512 (m4-1.4.18.tar.xz.sig) = effc857a19f1496d6dde2887c0314b37d4b142a435e77614936c730878c798491ad93b28860dddd2601f99a43fa41923729b961004faafc6f798f7bc1842f980 +SHA512 (m4-1.4.19.tar.xz) = 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b +SHA512 (m4-1.4.19.tar.xz.sig) = d6ac9c6a54c57e9b53fb3e34a60d49df2f46a6e494da0a0c9ae8246b984e68a853b5d8c42677c1a0485c3f36b0bce10a481d3775c0edc1dbdfb27b43545bc31e From 9b1c4a1bda86ee480729f381a6df82a343c8c57e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:35:38 +0000 Subject: [PATCH 06/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index 8a04bdf..d891c85 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ 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 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 From 809099a8cdcfe97481039800267a77df19b55d1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:32:14 +0000 Subject: [PATCH 07/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index d891c85..a95a245 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ 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 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 From 884f8ba72f80d9393886b40af2590d0fe4805019 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:20:59 +0000 Subject: [PATCH 08/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index a95a245..2049052 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ 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 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 From e902be100554f6f8aa5dd9b373528bdb6152c5f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:47:10 +0000 Subject: [PATCH 09/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index 2049052..001632b 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ 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 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 From 88caa89d091415bc41eef7d726837051b227d3b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:33:51 +0000 Subject: [PATCH 10/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index 001632b..412ab4a 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ 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 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 From 25fbe609d8469ac3af31898d5557238ed7955233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= Date: Tue, 8 Aug 2023 14:42:44 +0200 Subject: [PATCH 11/20] Migrate to SPDX licenses License scanning done on the binary RPM itself, cross-checked with source RPM for non-text based files. --- m4.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/m4.spec b/m4.spec index 412ab4a..5077406 100644 --- a/m4.spec +++ b/m4.spec @@ -1,8 +1,8 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 6%{?dist} -License: GPLv3+ +Release: 7%{?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 URL: https://www.gnu.org/software/m4/ @@ -50,6 +50,9 @@ make %{?_smp_mflags} check %{_mandir}/man1/m4.1* %changelog +* 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 From 2ed6a158364a6d87c0f6c93571467c0ef14afa00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:43:31 +0000 Subject: [PATCH 12/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index 5077406..6d91c1f 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 7%{?dist} +Release: 8%{?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 +* 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). From c06055e568627af420bf84040985091bc62aa200 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 05:34:39 +0000 Subject: [PATCH 13/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index 6d91c1f..aae0f9e 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 8%{?dist} +Release: 9%{?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 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 From 75eaca321421745fc62d05524c58cc7b51ecd488 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 16:32:39 +0000 Subject: [PATCH 14/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- m4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m4.spec b/m4.spec index aae0f9e..23be7bc 100644 --- a/m4.spec +++ b/m4.spec @@ -1,7 +1,7 @@ Summary: GNU macro processor Name: m4 Version: 1.4.19 -Release: 9%{?dist} +Release: 10%{?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 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 From d2aebca4643abbf9e206e550b91cef129c9528a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:39:56 +0000 Subject: [PATCH 15/20] 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 16/20] 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 17/20] 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 18/20] 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 19/20] 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 20/20] 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