From 955de5c33e41859ccd2ef0680757ab77a377ab4d Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 20 Feb 2020 06:19:58 -0700 Subject: [PATCH] tests now require skopeo; and fix an Obsoletes system tests now test skopeo-podman compatibility of login credentials; include 'Requires: skopeo' in tests package. While doing so I noticed 'Obsoletes: oci-systemd-hook' in the tests package; this is almost certainly in the wrong place. I moved it to the main package. Signed-off-by: Ed Santiago --- podman.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 042b43f..6cccbf9 100644 --- a/podman.spec +++ b/podman.spec @@ -86,6 +86,7 @@ Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} Requires: (container-selinux if selinux-policy) +Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel @@ -400,7 +401,7 @@ Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bats Requires: jq -Obsoletes: oci-systemd-hook <= 0.2.0-3 +Requires: skopeo %description tests %{summary} @@ -465,7 +466,7 @@ export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devic export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" %endif %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -%endif +%endif pushd dnsname-%{commit_plugins} mkdir _build