From 7ba81819d16534d727efbfa0e4993d216e52cd8f Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 4 Dec 2025 13:36:32 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .gitignore | 2 +- .supermin.metadata | 2 +- SOURCES/supermin-5.3.3.tar.gz.sig | 17 ---------------- SOURCES/supermin-5.3.5.tar.gz.sig | 17 ++++++++++++++++ SPECS/supermin.spec | 33 ++++++++++++++++++++++++++----- 5 files changed, 47 insertions(+), 24 deletions(-) delete mode 100644 SOURCES/supermin-5.3.3.tar.gz.sig create mode 100644 SOURCES/supermin-5.3.5.tar.gz.sig diff --git a/.gitignore b/.gitignore index 2ef439d..4f27300 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/libguestfs.keyring -SOURCES/supermin-5.3.3.tar.gz +SOURCES/supermin-5.3.5.tar.gz diff --git a/.supermin.metadata b/.supermin.metadata index c58d97e..64a79d9 100644 --- a/.supermin.metadata +++ b/.supermin.metadata @@ -1,2 +1,2 @@ 1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring -0d6c5baa0dc7f535bea18611e11d5590be28d168 SOURCES/supermin-5.3.3.tar.gz +9d3d986294d1b1538e5b12e85fb663ac060afb74 SOURCES/supermin-5.3.5.tar.gz diff --git a/SOURCES/supermin-5.3.3.tar.gz.sig b/SOURCES/supermin-5.3.3.tar.gz.sig deleted file mode 100644 index f98d3ec..0000000 --- a/SOURCES/supermin-5.3.3.tar.gz.sig +++ /dev/null @@ -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----- diff --git a/SOURCES/supermin-5.3.5.tar.gz.sig b/SOURCES/supermin-5.3.5.tar.gz.sig new file mode 100644 index 0000000..91af7ce --- /dev/null +++ b/SOURCES/supermin-5.3.5.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmbS4agRHHJpY2hAYW5u +ZXhpYS5vcmcACgkQkXOPc+G3aKBlNBAAiPzTds3pM4BGDyCgbu8yEkngUO6ZPYES +SJHmsszeFZkWGaZ7ZBOuHYvr+86/A6KclbNWXcFRvJWLo3eySCvbqipVrUTs+rX5 +qs95h5Az9new907v6z4kVG9oPD1nni2QKNXotAoFmpmlCHuZr1fmCeWR/Y8RNTAm +8+eMMBFw4XJfwWw84MFR26kwBGHNsmWx76oHOuALl3u3uG8HVDO0YeSWFQKHmcMP +nv9wBhrVVmvK//qZblf7+IKs/mjDMNHxqfHu7T28p/J6T1zXN7b1vL84hl5wrN4O +g/Uv2cm3TYlg6tT4xgIE2JAkiHDNXl7tbD2uWnhL/C9DLEIHkcNse3BUzdpQnrO2 +JlGEql0dhoXeYTAJwAxg0vr/qREcjYXr9m2x4eSfod3HTwwKjltIWQ+iblTJWwgd +SYkUh85GiaabwAH6OUKBIyXmJsnvNeSb5ZlZQ6Q4WlPQsva9Yi1JjxyMIl16NVIC +L/5+QH7R0T6LXayLmFzKLADPV/h707ULD2uf538G7k5Zt9k2CoNdBBhN0Ngqq3TX +jfmvRF57Tha8bn4j0Y4bcX1/0ladicY/0zAvQ5W9lYDFypoEp2jH6Ii0ZFCpuyZK +ERXQDZmhA6txzt957I9t44+M6w0uLpPIQZDwlWeabhmdMzLjf6DJ24hzh5MZRXXz +s2eS9Ln+ijc= +=ELxQ +-----END PGP SIGNATURE----- diff --git a/SPECS/supermin.spec b/SPECS/supermin.spec index a1169ce..4138990 100644 --- a/SPECS/supermin.spec +++ b/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.5 Release: 1%{?dist}.alma.1 -License: GPLv2+ +License: GPL-2.0-or-later ExclusiveArch: %{kernel_arches} %if 0%{?rhel} @@ -55,8 +62,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 @@ -123,8 +134,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 @@ -146,7 +161,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" @@ -189,9 +208,13 @@ make check || { %changelog -* Tue Apr 08 2025 Eduard Abdullin - 5.3.3-1.alma.1 +* Wed Apr 09 2025 Eduard Abdullin - 5.3.5-1.alma.1 - Enable building for ppc64le +* Mon Sep 02 2024 Richard W.M. Jones - 5.3.5-1 +- Rebase to Fedora Rawhide + resolves: RHEL-56805 + * Tue Oct 18 2022 Richard W.M. Jones - 5.3.3-1 - Rebase to Fedora Rawhide resolves: rhbz#2135767