Fix a changelog entry

Remove patches which are now all upstream.

0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch

@@ -0,0 +1,33 @@
+From 7a80a6eec799841b828ba7f617709562d8061435 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+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 <rjones@redhat.com>
+---
+ 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
+

sources

@@ -1,2 +1,2 @@
-SHA512 (supermin-5.3.2.tar.gz) = 501731e9cce8bf1f4743eeff4af620813d466da10b664df037575a546b3b8e8697ed9e881dde7d3ba737e6a78536717c1823e22cdc1c92409db78d976a6678b5
-SHA512 (supermin-5.3.2.tar.gz.sig) = 5006481ab4c9a5ef5120654ac36fef3da634e03e0cacf4c27f44a5b37d7a906f3fdf911fde666a8f8dd08fce7e129399dbbb139d8e29c05a54dac9399ce31c9a
+SHA512 (supermin-5.3.5.tar.gz) = e410bafe06805880f0f701e78d743a6e22e9d25e57bd70a020d583dba6d710ba9917d7afc37be714d9bde410c7ff35f4198300b3af0858d761b0b3e07af58dc0
+SHA512 (supermin-5.3.5.tar.gz.sig) = 88f446c3855367dd8917a6eb44d926f8a09dac9913d9098757951ccb3300f9e3544689a45d661382ae24221f8558bbfc188976f4db288829c28379b87949ed7e

supermin.spec

@@ -1,4 +1,5 @@
-%undefine _package_note_flags
+# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
+ExcludeArch: %{ix86}
 
 # On platforms and architectures that support it, the default is
 # ‘--with dietlibc’.
@@ -22,6 +23,12 @@
 %endif
 %endif
 
+%if 0%{?fedora} > 40 || 0%{?rhel} > 10
+%bcond_without dnf5
+%else
+%bcond_with dnf5
+%endif
+
 # Whether we should verify tarball signature with GPGv2.
 %global verify_tarball_signature 1
 
@@ -30,9 +37,9 @@
 
 Summary:       Tool for creating supermin appliances
 Name:          supermin
-Version:       5.3.2
-Release:       1%{?dist}
-License:       GPLv2+
+Version:       5.3.5
+Release:       7%{?dist}
+License:       GPL-2.0-or-later
 
 ExclusiveArch: %{kernel_arches}
 %if 0%{?rhel}
@@ -46,13 +53,24 @@ 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
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2html
 BuildRequires: rpm
 BuildRequires: rpm-devel
+%if %{with dnf5}
+BuildRequires: dnf5
+%else
 BuildRequires: dnf
 BuildRequires: dnf-plugins-core
+%endif
 BuildRequires: /usr/sbin/mke2fs
 BuildRequires: e2fsprogs-devel
 BuildRequires: findutils
@@ -86,16 +104,16 @@ BuildRequires: grubby
 # https://bugzilla.redhat.com/show_bug.cgi?id=1331012
 BuildRequires: systemd-udev
 
+# This only includes the dependencies needed at runtime, ie.  supermin
+# --build.  For supermin --prepare, dependencies like dnf are placed
+# in the -devel subpackage.
 Requires:      rpm
-Requires:      dnf
-Requires:      dnf-plugins-core
 Requires:      util-linux-ng
 Requires:      cpio
 Requires:      tar
 Requires:      /usr/sbin/mke2fs
 # RHBZ#771310
 Requires:      e2fsprogs-libs >= 1.42
-Requires:      findutils
 
 # For automatic RPM dependency generation.
 # See: https://rpm-software-management.github.io/rpm/manual/dependency_generators.html
@@ -109,18 +127,31 @@ appliances (similar to virtual machines), usually around 100KB in
 size, which get fully instantiated on-the-fly in a fraction of a
 second when you need to boot one of them.
 
+Note that if you want to run 'supermin --prepare' you will need the
+extra dependencies provided by %{name}-devel.
+
 
 %package devel
 Summary:       Development tools for %{name}
 Requires:      %{name} = %{version}-%{release}
 Requires:      rpm-build
 
+# Dependencies needed for supermin --prepare
+%if %{with dnf5}
+Requires:      dnf5
+%else
+Requires:      dnf
+Requires:      dnf-plugins-core
+%endif
+Requires:      findutils
+
 
 %description devel
 %{name}-devel contains development tools for %{name}.
 
-It just contains tools for automatic RPM dependency generation
-from supermin appliances.
+It contains extra dependencies needed for 'supermin --prepare' to
+work, as well as tools for automatic RPM dependency generation from
+supermin appliances.
 
 
 %prep
@@ -132,7 +163,12 @@ from supermin appliances.
 
 
 %build
-%configure --disable-network-tests
+autoreconf -fi
+# Setting DNF is temporarily required for Rawhide.  We should be able
+# to remove this later.  See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=2209412
+# https://fedoraproject.org/wiki/Changes/ReplaceDnfWithDnf5
+%configure %{?with_dnf5:DNF=%{_bindir}/dnf5} --disable-network-tests
 
 %if %{with dietlibc}
 make -C init CC="diet gcc"
@@ -175,6 +211,108 @@ make check || {
 
 
 %changelog
+* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 5.3.5-7
+- OCaml 5.4.0 rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 5.3.5-5
+- Rebuild to fix OCaml dependencies
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jan  9 2025 Jerry James <loganjerry@gmail.com> - 5.3.5-3
+- OCaml 5.3.0 rebuild for Fedora 42
+
+* Mon Oct 21 2024 Richard W.M. Jones <rjones@redhat.com> - 5.3.5-2
+- Use stable owner, group and mtime in base.tar.gz (RHBZ#2320025)
+
+* Sat Aug 31 2024 Richard W.M. Jones <rjones@redhat.com> - 5.3.5-1
+- New upstream version 5.3.5
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 5.3.4-4
+- OCaml 5.2.0 ppc64le fix
+
+* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 5.3.4-3
+- OCaml 5.2.0 for Fedora 41
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jan 11 2024 Richard W.M. Jones <rjones@redhat.com> - 5.3.4-1
+- New upstream version 5.3.4
+- Remove patches which are now all upstream.
+
+* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-19
+- OCaml 5.1.1 + s390x code gen fix for Fedora 40
+
+* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-18
+- OCaml 5.1.1 rebuild for Fedora 40
+
+* Fri Nov 10 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-17
+- Fix RISC-V gzip compressed kernels
+
+* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-16
+- OCaml 5.1 rebuild for Fedora 40
+
+* Wed Aug 02 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 5.3.3-15
+- Defer dnf5 until Fedora 41
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.3-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jul 12 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-13
+- OCaml 5.0 rebuild for Fedora 39
+
+* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 5.3.3-10
+- OCaml 5.0.0 rebuild
+
+* Mon Jun 12 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-9
+- Fix --if-newer
+
+* Mon Jun 05 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-8
+- Migrated to SPDX license
+
+* Wed May 31 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-7
+- Further fix for dnf5 (RHBZ#2211386)
+
+* Tue May 30 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-6
+- Add support for dnf5 (RHBZ#2209412)
+
+* Fri May 19 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-5
+- Rebuild against librpm 10
+
+* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-4
+- Rebuild OCaml packages for F38
+
+* Sat Jan 21 2023 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-3
+- Deal with new RPM database location
+- https://fedoraproject.org/wiki/Changes/RelocateRPMToUsr
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Oct 18 2022 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-1
+- New upstream development version 5.3.3
+
+* Wed Sep 07 2022 Richard W.M. Jones <rjones@redhat.com> - 5.3.2-5
+- Include all upstream patches since 5.3.2
+- Add debugging and accurate exception backtraces (RHBZ#2124571).
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 5.3.2-3
+- OCaml 4.14.0 rebuild
+
+* Sun May 15 2022 Richard W.M. Jones <rjones@redhat.com> - 5.3.2-2
+- Move dependency on dnf to -devel subpackage (RHBZ#2086302)
+
 * Fri Mar 04 2022 Richard W.M. Jones <rjones@redhat.com> - 5.3.2-1
 - New upstream development version 5.3.2