From 3407b65673d7248b71716005159a3b84051d8544 Mon Sep 17 00:00:00 2001
From: Jakub Martisko <jamartis@redhat.com>
Date: Thu, 1 Feb 2024 11:17:39 +0100
Subject: [PATCH] Update to gzip-1.13

---
 .gitignore |  1 +
 gzip.spec  | 13 ++++++++++---
 sources    |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 653a7cc..d53c255 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ gzip-1.4.tar.xz
 /gzip-1.10.tar.xz
 /gzip-1.11.tar.xz
 /gzip-1.12.tar.xz
+/gzip-1.13.tar.xz
diff --git a/gzip.spec b/gzip.spec
index df7212b..0573681 100644
--- a/gzip.spec
+++ b/gzip.spec
@@ -1,7 +1,7 @@
 Summary: GNU data compression program
 Name: gzip
-Version: 1.12
-Release: 8%{?dist}
+Version: 1.13
+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
@@ -50,7 +50,8 @@ export CC="%{__cc}"
 export CPP="%{__cpp}"
 export CXX="%{__cxx}"
 %ifarch s390x
-export CFLAGS="$RPM_OPT_FLAGS -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
 %else
 %configure
@@ -85,6 +86,12 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir}
 %{profiledir}/*
 
 %changelog
+* Thu Feb 01 2024 Jakub Martisko <jamartis@redhat.com> - 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
+- Revert the s390x build options in the next release
+Resolves: rhbz#2232890
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 3aad54d..5d79e70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gzip-1.12.tar.xz) = 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24
+SHA512 (gzip-1.13.tar.xz) = e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c