From 7b7a2125df78cc5562bc2846a0546090f9aa5e68 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Apr 03 2018 13:53:09 +0000
Subject: remove registries.conf, install it in skopeo-containers


---

diff --git a/atomic.spec b/atomic.spec
index 697798e..d61bb42 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -22,7 +22,7 @@
 
 Name: atomic
 Version: 1.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tool for managing ProjectAtomic systems and containers
 License: LGPLv2+
 URL: https://github.com/projectatomic/atomic
@@ -73,7 +73,6 @@ Requires: gomtree >= 0.3.1-1
 Requires: polkit
 Requires: setup
 Requires: skopeo >= 0.1.14-4
-Requires: skopeo-containers >= 0.1.14-4
 Requires: runc
 Requires: ostree
 Requires: rpm-%{pypkg}
@@ -120,6 +119,7 @@ BuildRequires: %{pypkg}-yaml
 Requires: %{pypkg}-pytoml
 Requires: %{pypkg}-yaml
 Requires: %{pypkg}-setuptools
+Requires: skopeo-containers >= 0.1.29-3
 
 %description registries
 Utility that parses a global YAML registry file for container runtimes.
@@ -176,13 +176,6 @@ EOF
 pushd ../registries-%{commit_atomic_registries}
 make install DESTDIR=%{buildroot}
 install -d %{buildroot}%{_sysconfdir}/containers/
-%if 0%{?rhel} && 0%{?rhel} <= 7
-install -p -m 644 registries.redhat %{buildroot}%{_sysconfdir}/containers/registries.conf
-%else if 0%{?fedora}
-install -p -m 644 registries.fedora %{buildroot}%{_sysconfdir}/containers/registries.conf
-%else
-install -p -m 644 registries.conf %{buildroot}%{_sysconfdir}/containers/
-%endif
 install -d %{buildroot}%{_unitdir}
 install -p -m 644  registries.service %{buildroot}%{_unitdir}
 
@@ -210,12 +203,14 @@ popd
 %{_libexecdir}/registries
 %{_libexecdir}/registries_migrator
 %{_mandir}/man1/registries*
-%config(noreplace) %{_sysconfdir}/containers/registries.conf
 %{_unitdir}/registries.service
 %{pysitelib}/registries
 %{pysitelib}/registries-*.egg-info
 
 %changelog
+* Mon Apr 2 2018 dwalsh <dwalsh@redhat.com> - 1.20.1-2
+- remove registries.conf, install it in skopeo-containers
+
 * Wed Feb 21 2018 baude <bbaude@redhat.com> - 1.22.1-1
 - v1.22 release