diff --git a/0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch b/0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch deleted file mode 100644 index 6e70551..0000000 --- a/0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7a80a6eec799841b828ba7f617709562d8061435 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 21 Oct 2024 11:55:53 +0100 -Subject: [PATCH] prepare: Use stable owner, group and mtime in base.tar.gz - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2320025 -Signed-off-by: Richard W.M. Jones ---- - src/mode_prepare.ml | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/mode_prepare.ml b/src/mode_prepare.ml -index 70f9dd4..6af47b1 100644 ---- a/src/mode_prepare.ml -+++ b/src/mode_prepare.ml -@@ -166,9 +166,12 @@ let prepare debug (copy_kernel, format, host_cpu, - let base = outputdir // "base.tar.gz" in - if debug >= 1 then printf "supermin: writing %s\n%!" base; - let cmd = -- sprintf "tar%s -C %s -zcf %s -T %s" -+ let mtime = -+ try sprintf "--mtime=@%s" (quote (Sys.getenv "SOURCE_DATE_EPOCH")) -+ with Not_found -> "" in -+ sprintf "tar%s -C %s -z --owner=0 --group=0 %s -cf %s -T %s" - (if debug >=1 then " -v" else "") -- (quote dir) (quote base) (quote files_from) in -+ (quote dir) mtime (quote base) (quote files_from) in - run_command cmd; - ) - else ( --- -2.46.0 - diff --git a/sources b/sources index cc31e54..2def3d0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (supermin-5.3.5.tar.gz) = e410bafe06805880f0f701e78d743a6e22e9d25e57bd70a020d583dba6d710ba9917d7afc37be714d9bde410c7ff35f4198300b3af0858d761b0b3e07af58dc0 -SHA512 (supermin-5.3.5.tar.gz.sig) = 88f446c3855367dd8917a6eb44d926f8a09dac9913d9098757951ccb3300f9e3544689a45d661382ae24221f8558bbfc188976f4db288829c28379b87949ed7e +SHA512 (supermin-5.3.4.tar.gz) = 383d783f57af3a870f1debd3c87929b1d73a12d404c3268640963967a53582419923076410d47e79de0eb2a111fe66a998258e636de41caa3ff7f296b5458797 +SHA512 (supermin-5.3.4.tar.gz.sig) = 1cae330cc4cee6c48e238738a4fd26b31f21f5ffb054b0496d6eebc5e45d0599c2a9586f3e0a9fe25475ab184394bf5d4155a5c5f82b83a380da0994568c8937 diff --git a/supermin.spec b/supermin.spec index ee09a0f..a68c7ec 100644 --- a/supermin.spec +++ b/supermin.spec @@ -37,8 +37,8 @@ ExcludeArch: %{ix86} Summary: Tool for creating supermin appliances Name: supermin -Version: 5.3.5 -Release: 7%{?dist} +Version: 5.3.4 +Release: 1%{?dist} License: GPL-2.0-or-later ExclusiveArch: %{kernel_arches} @@ -53,11 +53,6 @@ Source1: http://download.libguestfs.org/supermin/%{source_directory}/%{nam # Keyring used to verify tarball signature. Source2: libguestfs.keyring -# Use stable owner, group and mtime in base.tar.gz -# Upstream in > 5.3.5 -# https://bugzilla.redhat.com/show_bug.cgi?id=2320025 -Patch1: 0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch - BuildRequires: gcc BuildRequires: make BuildRequires: autoconf, automake @@ -211,39 +206,6 @@ make check || { %changelog -* Mon Oct 13 2025 Richard W.M. Jones - 5.3.5-7 -- OCaml 5.4.0 rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 5.3.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jul 11 2025 Jerry James - 5.3.5-5 -- Rebuild to fix OCaml dependencies - -* Sun Jan 19 2025 Fedora Release Engineering - 5.3.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jan 9 2025 Jerry James - 5.3.5-3 -- OCaml 5.3.0 rebuild for Fedora 42 - -* Mon Oct 21 2024 Richard W.M. Jones - 5.3.5-2 -- Use stable owner, group and mtime in base.tar.gz (RHBZ#2320025) - -* Sat Aug 31 2024 Richard W.M. Jones - 5.3.5-1 -- New upstream version 5.3.5 - -* Sat Jul 20 2024 Fedora Release Engineering - 5.3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jun 19 2024 Richard W.M. Jones - 5.3.4-4 -- OCaml 5.2.0 ppc64le fix - -* Wed May 29 2024 Richard W.M. Jones - 5.3.4-3 -- OCaml 5.2.0 for Fedora 41 - -* Sat Jan 27 2024 Fedora Release Engineering - 5.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Thu Jan 11 2024 Richard W.M. Jones - 5.3.4-1 - New upstream version 5.3.4 - Remove patches which are now all upstream.