summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-02-01 16:15:33 -0500
committerGitHub <noreply@github.com>2022-02-01 16:15:33 -0500
commit6f491e21aa291ac0e9cbda5f41e7dc8b87fe160c (patch)
tree2bd1a2dd1de1cb2a631197c943dfce9b61567081
parent60528b9c995ac6060f93a0b58aa809be75df4118 (diff)
parentcd8b302895c8fdc420641a582a4d7593137f9e8e (diff)
downloadpodman-6f491e21aa291ac0e9cbda5f41e7dc8b87fe160c.tar.gz
podman-6f491e21aa291ac0e9cbda5f41e7dc8b87fe160c.tar.bz2
podman-6f491e21aa291ac0e9cbda5f41e7dc8b87fe160c.zip
Merge pull request #13105 from lsm5/copr-fix-dependencies
COPR: fix dependencies
-rw-r--r--podman.spec.rpkg11
1 files 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