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

Conflicts with atomic-registries should be for containers-common and not skopeo-devel

Browse Source 
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2018-06-12 08:50:48 -04:00
parent 6974d6d75c
commit f12171e5a9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skopeo.spec
View File

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