From 71c4e3c1789adecc74e853a0a2d9f499355804c3 Mon Sep 17 00:00:00 2001 From: Stepan Oksanichenko Date: Thu, 5 Sep 2024 17:28:11 +0300 Subject: [PATCH] - Use xorriso as recommended package and genisoimage as required for RHEL8/9 and vice versa for RHEL10 --- pungi.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pungi.spec b/pungi.spec index c443c468..6a296c7f 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,7 +2,7 @@ Name: pungi Version: 4.7.0 -Release: 1%{?dist}.alma +Release: 2%{?dist}.alma Summary: Distribution compose tool License: GPL-2.0-only @@ -55,7 +55,11 @@ Requires: createrepo_c >= 0.20.1 Requires: koji >= 1.10.1-13 Requires: python3-koji-cli-plugins Requires: isomd5sum +%if %{rhel} == 8 or %{rhel} == 9 Requires: genisoimage +%else +Recommends: genisoimage +%endif Requires: git Requires: python3-dnf Requires: python3-multilib @@ -67,7 +71,11 @@ Requires: python3-createrepo_c >= 0.20.1 Requires: python3-PyYAML Requires: python3-productmd >= 1.38 Requires: python3-flufl-lock +%if %{rhel} == 10 Requires: xorriso +%else +Recommends: xorriso +%endif Requires: python3-productmd >= 1.33 Requires: lorax Requires: python3-distro @@ -166,6 +174,9 @@ rm %{buildroot}%{_bindir}/pungi %{_bindir}/%{name}-cache-cleanup %changelog +* Thu Sep 05 2024 Stepan Oksanichenko - 4.7.0-2 +- Use xorriso as recommended package and genisoimage as required for RHEL8/9 and vice versa for RHEL10 + * Thu Aug 22 2024 Lubomír Sedlář - 4.7.0-1 - kiwibuild: Add support for type, type attr and bundle format (lsedlar) - createiso: Block reuse if unsigned packages are allowed (lsedlar)