Skip to content

Commit

Permalink
COPR: fix dependencies
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
lsm5 committed Feb 1, 2022
1 parent dad946b commit cd8b302
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions podman.spec.rpkg
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit cd8b302

Please sign in to comment.