From 6e020fd36b4965f95b9fbd1b9bdb466a11b56607 Mon Sep 17 00:00:00 2001 From: Jacob Kozol Date: Mon, 13 Jul 2020 16:19:13 +0200 Subject: [PATCH] spec: change weldr requirement The "Suggests" hint does not always resolve our dependencies as desired so, for new releases, cockpit-composer specifically requires osbuild-composer. For distros that cockpit-composer has already released into, the "weldr" group remains the requirement so that users already running osbuild-composer as the backend can continue to use it instead of lorax-composer. But, if osbuild-composer is unavailable, lorax is installed instead. --- cockpit-composer.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cockpit-composer.spec.in b/cockpit-composer.spec.in index 7bcaffa90..6dde92666 100644 --- a/cockpit-composer.spec.in +++ b/cockpit-composer.spec.in @@ -11,8 +11,12 @@ BuildArch: noarch BuildRequires: libappstream-glib Requires: cockpit -Requires: weldr -Suggests: osbuild-composer >= 14 +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8 +Requires: osbuild-composer >= 14 +%else +Requires: weldr +Suggests: osbuild-composer >= 14 +%endif %description Composer generates custom images suitable for deploying systems or uploading to