rpms/supermin
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to Fedora Rawhide

Browse Source 
resolves: RHEL-56805
This commit is contained in:
Richard W.M. Jones 2024-09-02 16:19:39 +01:00
parent ed1524d043
commit 3ade9b4233
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (supermin-5.3.3.tar.gz) = 39eb687a4e6fbd13d356612f950352848626fe68a14054a62ac7fa1bb3b42be716189b1505bf137331974ea02d75e2e8079f412a133af165cba7767699925f38 SHA512 (supermin-5.3.5.tar.gz) = e410bafe06805880f0f701e78d743a6e22e9d25e57bd70a020d583dba6d710ba9917d7afc37be714d9bde410c7ff35f4198300b3af0858d761b0b3e07af58dc0
SHA512 (supermin-5.3.3.tar.gz.sig) = e5109e718b06992bde73be913be49cd00358ec835566beb1f207109f54f73dbc6600275e929eb88fea42bda13643ec3ee9bb80032f8a05c37537f28bafb49fad SHA512 (supermin-5.3.5.tar.gz.sig) = 88f446c3855367dd8917a6eb44d926f8a09dac9913d9098757951ccb3300f9e3544689a45d661382ae24221f8558bbfc188976f4db288829c28379b87949ed7e

31
supermin.spec
View File

@ -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 # On platforms and architectures that support it, the default is
# ‘--with dietlibc’. # ‘--with dietlibc’.
@ -22,6 +23,12 @@
%endif %endif
%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. # Whether we should verify tarball signature with GPGv2.
%global verify_tarball_signature 1 %global verify_tarball_signature 1
@ -30,9 +37,9 @@
Summary: Tool for creating supermin appliances Summary: Tool for creating supermin appliances
Name: supermin Name: supermin
Version: 5.3.3 Version: 5.3.5
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPL-2.0-or-later
ExclusiveArch: %{kernel_arches} ExclusiveArch: %{kernel_arches}
%if 0%{?rhel} %if 0%{?rhel}
@ -53,8 +60,12 @@ BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2html BuildRequires: /usr/bin/pod2html
BuildRequires: rpm BuildRequires: rpm
BuildRequires: rpm-devel BuildRequires: rpm-devel
%if %{with dnf5}
BuildRequires: dnf5
%else
BuildRequires: dnf BuildRequires: dnf
BuildRequires: dnf-plugins-core BuildRequires: dnf-plugins-core
%endif
BuildRequires: /usr/sbin/mke2fs BuildRequires: /usr/sbin/mke2fs
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
BuildRequires: findutils BuildRequires: findutils
@ -121,8 +132,12 @@ Requires: %{name} = %{version}-%{release}
Requires: rpm-build Requires: rpm-build
# Dependencies needed for supermin --prepare # Dependencies needed for supermin --prepare
%if %{with dnf5}
Requires: dnf5
%else
Requires: dnf Requires: dnf
Requires: dnf-plugins-core Requires: dnf-plugins-core
%endif
Requires: findutils Requires: findutils
@ -144,7 +159,11 @@ supermin appliances.
%build %build
autoreconf -fi 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} %if %{with dietlibc}
make -C init CC="diet gcc" make -C init CC="diet gcc"
@ -187,6 +206,10 @@ make check || {
%changelog %changelog
* Mon Sep 02 2024 Richard W.M. Jones <rjones@redhat.com> - 5.3.5-1
- Rebase to Fedora Rawhide
resolves: RHEL-56805
* Tue Oct 18 2022 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-1 * Tue Oct 18 2022 Richard W.M. Jones <rjones@redhat.com> - 5.3.3-1
- Rebase to Fedora Rawhide - Rebase to Fedora Rawhide
resolves: rhbz#2135767 resolves: rhbz#2135767