From f12171e5a9bfb3364148d5154f6e230548d1f117 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 12 Jun 2018 08:50:48 -0400
Subject: [PATCH] Conflicts with atomic-registries should be for
 containers-common and not skopeo-devel

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 skopeo.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skopeo.spec b/skopeo.spec
index de1ffeb..3181630 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -170,7 +170,6 @@ Summary: Unit tests for %{name} package
 
 # test subpackage tests code from devel subpackage
 Requires: %{name}-devel = %{version}-%{release}
-conflicts: atomic-registries <= 1.22.1-1
 
 %description unit-test-devel
 %{summary}
@@ -182,6 +181,7 @@ providing packages with %{import_path} prefix.
 %package -n containers-common
 Summary: Configuration files for working with image signatures
 Obsoletes: atomic <= 1.13.1-2
+Conflicts: atomic-registries <= 1.22.1-1
 Obsoletes: docker-rhsubscription <= 2:1.13.1-31
 %if 0%{?centos}
 Provides: %{name}-containers = %{epoch}:%{version}-%{release}