rpms/podman
7
0
Fork 0
Code Issues Pull Requests Releases Activity

tests now require skopeo; and fix an Obsoletes

Browse Source 
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 <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2020-02-20 06:19:58 -07:00
parent 1dc0bd307a
commit 955de5c33e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
podman.spec
View File

@ -86,6 +86,7 @@ Requires: nftables
Requires: conmon Requires: conmon
Requires: %{name}-plugins = %{epoch}:%{version}-%{release} Requires: %{name}-plugins = %{epoch}:%{version}-%{release}
Requires: (container-selinux if selinux-policy) Requires: (container-selinux if selinux-policy)
Obsoletes: oci-systemd-hook <= 0.2.0-3
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: btrfs-progs-devel BuildRequires: btrfs-progs-devel
BuildRequires: ostree-devel BuildRequires: ostree-devel
@ -400,7 +401,7 @@ Summary: Tests for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: bats Requires: bats
Requires: jq Requires: jq
Obsoletes: oci-systemd-hook <= 0.2.0-3 Requires: skopeo
%description tests %description tests
%{summary} %{summary}
@ -465,7 +466,7 @@ export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devic
export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub"
%endif %endif
%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
%endif %endif
pushd dnsname-%{commit_plugins} pushd dnsname-%{commit_plugins}
mkdir _build mkdir _build