From a13589cd1846ab52aa9523cc7f009a4773e4eada Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 17 Oct 2017 10:04:23 -0400 Subject: [PATCH] skopeo-0.1.24-6.dev.git28d4e08 - skopeo-containers conflicts with docker-rhsubscription <= 2:1.13.1-31 Signed-off-by: Lokesh Mandvekar --- skopeo.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/skopeo.spec b/skopeo.spec index ed1efa2..f83a169 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -38,7 +38,7 @@ Name: %{repo} Epoch: 1 %endif # centos Version: 0.1.24 -Release: 5.dev.git%{shortcommit0}%{?dist} +Release: 6.dev.git%{shortcommit0}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -178,6 +178,7 @@ providing packages with %{import_path} prefix. %package containers Summary: Configuration files for working with image signatures Conflicts: atomic <= 1.13.1-2 +Conflicts: docker-rhsubscription <= 2:1.13.1-31 %description containers This package installs a default signature store configuration and a default @@ -300,6 +301,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name} %changelog +* Tue Oct 17 2017 Lokesh Mandvekar - 0.1.24-6.dev.git28d4e08 +- skopeo-containers conflicts with docker-rhsubscription <= 2:1.13.1-31 + * Tue Oct 17 2017 dwalsh - 0.1.24-5.dev.git28d4e08 - Add rhel subscription secrets data to skopeo-containers