.gitignore

@@ -1,2 +1,2 @@
 SOURCES/libguestfs.keyring
-SOURCES/supermin-5.3.3.tar.gz
+SOURCES/supermin-5.3.4.tar.gz

.supermin.metadata

@@ -1,2 +1,2 @@
 1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring
-0d6c5baa0dc7f535bea18611e11d5590be28d168 SOURCES/supermin-5.3.3.tar.gz
+31727a46664e432d490b253498027140fa442578 SOURCES/supermin-5.3.4.tar.gz

SOURCES/supermin-5.3.3.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmNOrGARHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKAgHA/9EFGRdvIryS5UUcXz9yvaYs5WvMtuPn9s
-Dcb7lVwLsMkVpcMulOyN1sPTI4WkgqKeXSvSJXfby/Loon8p8aTlSDZkEhivMpDG
-TliKX5P8kySC+9KXSKfzHyVwKd6j/pmLtw3QvpgwuZPYdkIHzVluWKd1ql6nbLh/
-LsSg2YNyJi48i/W64xEGN0ENviYMmHoNnE56nFEApwHfG26j5bHvLZJqjFYS5ClF
-CJtoaAOEEAySbJmbKTxCByk44CxjfpUHHwupJ+QKoXIJmYFVAQO2jrW3zvR7zRyI
-rA1Woaqmft3PDszH9565AD34FFmXQ70+GOanO7tH1uk0wgK+lgpZpb0UMzcNBSPh
-6cU4wY4nvxww39HdGLQ95au54Lp4I90S8MGrtO7XD0N2fA6QlbcSMnpM3LM4CZDi
-g7SUeqWy6PRoqd6vEvO9MgAOIg/YbcnRCFZsUe2na04FvKI0jWFwor1Xm0RJIQrf
-ufpLjKG1hpjbQa0Hu0RISVKBMMnLfCg3Z5xMWq0mVysdGrJzWrTqYT5Os8KOU+04
-0Ni1DWw+o3CNacTVmOroRvsUYPzQiivutNgPovRaVIL4u6OwWw+tUtxRCpZlxzc/
-m00IGHLgKwdbHTShRqzp6P2QcuXS7SGv9EqNL7yJL3kvc5INp4XJ3QHDdpO2hz5S
-10cJfC6ph1o=
-=FSUE
------END PGP SIGNATURE-----

SOURCES/supermin-5.3.4.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmWf3ZIRHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKA6YBAApKMian3rGdXB4NDYC4lluPhDPKhlVYax
+hVZGuhqFXnTIzH0djjiKKe1jkPCPjDzCfp8OIFdgzj4HUaHI2N5gUeBHINa7HJi/
+AlsR33v+Wgw82I/oiEZiwAyDP+gX29M6j7tQnJEo8yj+sSOWEWp/sKTi6u1v/Za0
+N7DkRFf2mLeOo/W2MPkkA9YtUbjr/TzJBVv1OSo1ufOH9yZI+fx9B5lO1NMojcsG
+Km34sCzx0exv9DzkSOzhzMox7fCmBMpUDrx12Z1LX416dLMiiHVBc7SeTDTz8rPu
+jwRzF7WJpkAJxCKQc7vwNQb+XOGOh8SoEhwqMeGc/96y/IGf0h67Cz8TEm2DSdcq
+AvfaHlzsRObO9ZfeBPe5IdUMgZWBrAUD4jg4bWZVn0Fk9ibEZmaNNxY9Aa0nGCJc
+tjj7tzmriwYI7Rfu3jP9DmBH6CBaXd54eMxQMgZGaqJi2ad7aVWDTbTKKk5bgfhw
+bzplpnklIFomGwh4T7EkmiJiDbHlUEAGnulH6eQb26DCnzhQvaqo6J1/QA/XSK0L
+PzrzcW8n2gRmzdxKZhXd2TxYkcbZYSeUuf0z0TfZijLn+lz5hM8sNdTHnoU1p60h
+cuO3835oNI+j+4HdHhqPnjM9lurnPmIEb1b9bugQrP5PxrXTEADyNccwWZbAOKur
+fOgPyWyATTA=
+=2lcO
+-----END PGP SIGNATURE-----

SPECS/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.3
+Version:       5.3.4
-Release:       1%{?dist}
+Release:       5%{?dist}
-License:       GPLv2+
+License:       GPL-2.0-or-later
 
 ExclusiveArch: %{kernel_arches}
 %if 0%{?rhel}
@@ -53,8 +60,12 @@ 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
@@ -121,8 +132,12 @@ 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
 
 
@@ -144,7 +159,11 @@ supermin appliances.
 
 %build
 autoreconf -fi
-%configure --disable-network-tests
+# 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"
@@ -187,35 +206,118 @@ make check || {
 
 
 %changelog
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 5.3.4-5
+- Rebuilt for MSVSphere 10
+
+* Tue Jun 25 2024 Troy Dawson <tdawson@redhat.com> - 5.3.4-5
+- Bump release for June 2024 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
-- Rebase to Fedora Rawhide
+- New upstream development version 5.3.3
-  resolves: rhbz#2135767
+
+* 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)
 
-* Tue Mar 15 2022 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-8
+* Fri Mar 04 2022 Richard W.M. Jones <rjones@redhat.com> - 5.3.2-1
-- Fix ignore +debug kernels when choosing a kernel to boot
+- New upstream development version 5.3.2
-  resolves: rhbz#2059397
 
-* Wed Dec 01 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-7
+* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 5.3.1-5
+- OCaml 4.13.1 rebuild to remove package notes
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Dec 01 2021 Richard W.M. Jones <rjones@redhat.com> - 5.3.1-3
 - Further fix to ignore zfcpdump kernel on s390x
 
-* Tue Nov 30 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-6
+* Tue Nov 30 2021 Richard W.M. Jones <rjones@redhat.com> - 5.3.1-2
 - Ignore zfcpdump kernel on s390x
-  resolves: rhbz#2027375
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.2.1-4
+* Thu Aug 26 2021 Richard W.M. Jones <rjones@redhat.com> - 5.3.1-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- New upstream development version 5.3.1.
-  Related: rhbz#1991688
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Wed Jun  2 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-3
 - Add gating tests (for RHEL 9)
 
-* Fri May 07 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-2.el9.1
+* Fri May 07 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-2
 - Do not include the package on POWER on RHEL 9
   resolves: rhbz#1956934
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.2.1-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
 * Mon Feb 01 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-1
 - New upstream version 5.2.1.