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 ad68e32..653a7cc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,3 @@ 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 -/gzip-1.14.tar.xz diff --git a/gzip.spec b/gzip.spec index 3247385..9ebd657 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,9 +1,9 @@ Summary: GNU data compression program Name: gzip -Version: 1.14 -Release: 1%{?dist} +Version: 1.12 +Release: 3%{?dist} # info pages are under GFDL license -License: GPL-3.0-or-later AND GFDL-1.3-only +License: GPLv3+ and GFDL Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz Source1: https://www.gnu.org/licenses/fdl-1.3.txt @@ -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 @@ -50,17 +49,7 @@ export CPPFLAGS="-DHAVE_LSTAT" 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" -#use this in the next realease after gzip 1.13 export CFLAGS="$RPM_OPT_FLAGS -DDFLTCC_LEVEL_MASK=0x7e" -#%configure --enable-dfltcc - %configure -%else -%configure -%endif make %check make check @@ -91,42 +80,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 -- Revert the s390x build options in the next release -Resolves: rhbz#2232890 - -* Wed Jan 24 2024 Fedora Release Engineering - 1.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1.12-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Aug 02 2023 Jakub Martisko - 1.12-6 -- Enbale the s390x optimizations -Resolves: rhbz#2175699 - -* Thu Jul 20 2023 Fedora Release Engineering - 1.12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Apr 13 2023 Lukáš Zaoral - 1.12-4 -- migrate to SPDX license format - * Thu Jan 19 2023 Fedora Release Engineering - 1.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/plans/all.fmf b/plans/all.fmf deleted file mode 100644 index d5b1643..0000000 --- a/plans/all.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf - url: https://src.fedoraproject.org/tests/gzip.git -execute: - how: tmt 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..3aad54d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gzip-1.14.tar.xz) = 82aef53188b3e69b51b7ddab5b8c44a11a5b73c0039b22a315a0c7d244694feab0146748add4265901eb1b4c0cee8a9eb69594995f098830d964091af97079c5 +SHA512 (gzip-1.12.tar.xz) = 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24 diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..8793994 --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,2 @@ +*.swp +*.retry diff --git a/tests/test-simple b/tests/test-simple new file mode 100644 index 0000000..278d622 --- /dev/null +++ b/tests/test-simple @@ -0,0 +1,11 @@ +#!/bin/sh +set -ex + +# exercise installed gzip/gunzip programs +echo "Bla" > bla.file +cp bla.file bla.file.orig +gzip bla.file +gunzip bla.file.gz +cmp bla.file bla.file.orig +echo "hi" +rm bla.file bla.file.orig diff --git a/tests/test_simple.yml b/tests/test_simple.yml new file mode 100644 index 0000000..37fdd70 --- /dev/null +++ b/tests/test_simple.yml @@ -0,0 +1,32 @@ +--- +- hosts: localhost + vars: + - artifacts: ./artifacts + tags: + - atomic + - classic + - container + remote_user: root + tasks: + - name: Create the folder where we will store the tests + action: file state=directory path={{ item }} + owner=root group=root + with_items: + - /usr/local/bin + + - name: Install the test files + copy: src={{ item.file }} dest=/usr/local/bin/{{ item.dest }} + mode=0755 + with_items: + - {file: test-simple, dest: test-simple } + + - block: + - name: Execute the tests + shell: exec > /tmp/test.log && /usr/local/bin/test-simple 2>&1 + + - always: + - name: Pull out the logs + fetch: + dest: "{{ artifacts }}/" + src: "/tmp/test.log" + flat: yes diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..8a6aab3 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1 @@ +- include: test_simple.yml