From 25143454f9cdaf927fd52b442605e966c8976c4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 09:03:01 +0000 Subject: [PATCH 1/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 0573681..1d55de7 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.13 -Release: 1%{?dist} +Release: 2%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -86,6 +86,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Feb 01 2024 Jakub Martisko - 1.13-1 - Rebase to gzip 1.13 - There's a bug on s390x: https://lists.gnu.org/archive/html/bug-gzip/2023-10/msg00000.html From 4285f8ea22845a13f46c845a064bf4aaaa72d85e Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Mon, 2 Dec 2024 15:55:27 +0100 Subject: [PATCH 2/6] Spec: minor cleanup (unused patch) --- gzip.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/gzip.spec b/gzip.spec index 1d55de7..7239246 100644 --- a/gzip.spec +++ b/gzip.spec @@ -11,7 +11,6 @@ Source1: https://www.gnu.org/licenses/fdl-1.3.txt Source100: colorzgrep.csh Source101: colorzgrep.sh -Patch1: gnulib.patch # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 @@ -39,7 +38,6 @@ very commonly used data compression program. %prep %setup -q -#%patch1 -p1 -b .gnulib cp %{SOURCE1} . autoreconf From 04e0cd154d08617070c7de1f7b07ae2d4c3794b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 05:42:45 +0000 Subject: [PATCH 3/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 7239246..aad6147 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.13 -Release: 2%{?dist} +Release: 3%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -84,6 +84,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 1.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5ba0f55bf5a1b664353550b5590f751837bc1011 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:52:47 +0000 Subject: [PATCH 4/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index aad6147..26b18ca 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.13 -Release: 3%{?dist} +Release: 4%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -84,6 +84,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 61b4e3dd1e0a36d9e0f7ad477ac62752b6e454f6 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 14 Aug 2025 16:31:51 +0200 Subject: [PATCH 5/6] Rebase to gzip 1.14 - There are some issues when the s390x optimizations are turned on - the hufts test fails - This will need some further investigation, for the time, I've disabled the optimizations --- gzip.spec | 20 ++++++++++++++++---- s390_errno.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 s390_errno.patch diff --git a/gzip.spec b/gzip.spec index 26b18ca..3247385 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip -Version: 1.13 -Release: 4%{?dist} +Version: 1.14 +Release: 1%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -11,6 +11,7 @@ Source1: https://www.gnu.org/licenses/fdl-1.3.txt Source100: colorzgrep.csh Source101: colorzgrep.sh +Patch1: s390_errno.patch # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 @@ -38,6 +39,8 @@ very commonly used data compression program. %prep %setup -q +%patch 1 -p1 + cp %{SOURCE1} . autoreconf @@ -48,9 +51,13 @@ export CC="%{__cc}" export CPP="%{__cpp}" export CXX="%{__cxx}" %ifarch s390x -export CFLAGS="$RPM_OPT_FLAGS -Dalignas=_Alignas -DDFLTCC_LEVEL_MASK=0x7e" + +#When the otpimizations are enabled, the huft test fails as of F44/gzip1.14 +#export CFLAGS="$RPM_OPT_FLAGS -Dalignas=_Alignas -DDFLTCC_LEVEL_MASK=0x7e" #use this in the next realease after gzip 1.13 export CFLAGS="$RPM_OPT_FLAGS -DDFLTCC_LEVEL_MASK=0x7e" -%configure --enable-dfltcc +#%configure --enable-dfltcc + +%configure %else %configure %endif @@ -84,6 +91,11 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Aug 14 2025 Jakub Martisko - 1.14-1 +- Rebase to gzip 1.14 +- There are some issues when the s390x optimizations are turned on - the hufts test fails +- This will need some further investigation, for the time, I've disabled the optimizations + * Thu Jul 24 2025 Fedora Release Engineering - 1.13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/s390_errno.patch b/s390_errno.patch new file mode 100644 index 0000000..73ba47f --- /dev/null +++ b/s390_errno.patch @@ -0,0 +1,26 @@ +From c76affb4551630ff661ac1c1ee99353a17eb16e1 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 30 May 2025 12:31:04 -0700 +Subject: gzip: fix s390x build failure + +Problem reported by Jakub Martisko . +* dfltcc.c: Include errno.h. +--- + dfltcc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dfltcc.c b/dfltcc.c +index 9f86581..8307a97 100644 +--- a/dfltcc.c ++++ b/dfltcc.c +@@ -17,6 +17,7 @@ + + #include + ++#include + #include + + #ifdef HAVE_SYS_SDT_H +-- +cgit v1.2.3 + From 176a9b412f80c1d19b07f24133d044231645b5b2 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 14 Aug 2025 16:53:00 +0200 Subject: [PATCH 6/6] updated sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d53c255..ad68e32 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ gzip-1.4.tar.xz /gzip-1.11.tar.xz /gzip-1.12.tar.xz /gzip-1.13.tar.xz +/gzip-1.14.tar.xz diff --git a/sources b/sources index 5d79e70..6561239 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gzip-1.13.tar.xz) = e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c +SHA512 (gzip-1.14.tar.xz) = 82aef53188b3e69b51b7ddab5b8c44a11a5b73c0039b22a315a0c7d244694feab0146748add4265901eb1b4c0cee8a9eb69594995f098830d964091af97079c5