From cd8b302895c8fdc420641a582a4d7593137f9e8e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Feb 2022 14:15:38 -0500 Subject: COPR: fix dependencies containers-common rpm now `Recommends: netavark` and `Provides: container-network-stack` which are actually provided by both cni-plugins and netavark. Netavark has a `Recommends: aardvark-dns` already. So, we should only depend on the containers-common package and let it handle everything. Also, dnsname no longer needs to be recommended if we want new users to use netavark / aardvark-dns. [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar --- podman.spec.rpkg | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/podman.spec.rpkg b/podman.spec.rpkg index 4068b3a81..d02b7ea99 100644 --- a/podman.spec.rpkg +++ b/podman.spec.rpkg @@ -77,12 +77,15 @@ BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel Requires: conmon >= 2:2.0.30-2 -Requires: containers-common >= 4:1-30 -Requires: containernetworking-plugins >= 1.0.0-15.1 +# containers-common pulled from podman-next copr for f34, +# from the distro repos for f35+ +%if 0%{?fedora} <= 35 +Requires: containers-common >= 4:1-39 +%else +Requires: containers-common >= 4:1-46 +%endif Requires: iptables Requires: nftables -Requires: netavark -Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: catatonit Suggests: qemu-user-static -- cgit v1.2.3-54-g00ecf