From 60a3eb8491c0f3391033ced0637a6b4103081e06 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 13 Mar 2024 17:56:38 +0530 Subject: [PATCH] [skip-ci] rpm: update containers-common dep on f40+ This commit bumps containers-common dep such that passt and netavark become hard deps for podman on fedora 40+. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2269148 With this commit, f40+ envs will use the min name-version-release for containers-common-extra while other deps will use whatever's available. This change can be reverted after a few releases to keep conditionals to a minimum. Signed-off-by: Lokesh Mandvekar --- rpm/podman.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rpm/podman.spec b/rpm/podman.spec index 0a807a536a..6fee7006d6 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -101,7 +101,14 @@ BuildRequires: python3 %endif Requires: catatonit Requires: conmon >= 2:2.1.7-2 +%if %{defined fedora} && 0%{?fedora} >= 40 +# TODO: Remove the f40 conditional after a few releases to keep conditionals to +# a minimum +# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2269148 +Requires: containers-common-extra >= 5:0.58.0-1 +%else Requires: containers-common-extra +%endif %if %{defined rhel} && !%{defined eln} Recommends: gvisor-tap-vsock-gvforwarder %else