diff --git a/.gitignore b/.gitignore index ad68e32..d53c255 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,3 @@ 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/gzip.spec b/gzip.spec index 3247385..0573681 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,6 +1,6 @@ Summary: GNU data compression program Name: gzip -Version: 1.14 +Version: 1.13 Release: 1%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only @@ -11,7 +11,7 @@ Source1: https://www.gnu.org/licenses/fdl-1.3.txt Source100: colorzgrep.csh Source101: colorzgrep.sh -Patch1: s390_errno.patch +Patch1: gnulib.patch # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 @@ -39,8 +39,7 @@ very commonly used data compression program. %prep %setup -q -%patch 1 -p1 - +#%patch1 -p1 -b .gnulib cp %{SOURCE1} . autoreconf @@ -51,13 +50,9 @@ export CC="%{__cc}" export CPP="%{__cpp}" export CXX="%{__cxx}" %ifarch s390x - -#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" +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 +%configure --enable-dfltcc %else %configure %endif @@ -91,20 +86,6 @@ 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 - -* 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 - * 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 diff --git a/s390_errno.patch b/s390_errno.patch deleted file mode 100644 index 73ba47f..0000000 --- a/s390_errno.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - diff --git a/sources b/sources index 6561239..5d79e70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gzip-1.14.tar.xz) = 82aef53188b3e69b51b7ddab5b8c44a11a5b73c0039b22a315a0c7d244694feab0146748add4265901eb1b4c0cee8a9eb69594995f098830d964091af97079c5 +SHA512 (gzip-1.13.tar.xz) = e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c