From 632731f886b6562ef0f1b3e71955dc6289a64681 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 19 2017 14:33:38 +0000
Subject: import atomic-1.19.1-4.gitb39a783.el7


---

diff --git a/.atomic.metadata b/.atomic.metadata
index 16c0a65..ff33dc5 100644
--- a/.atomic.metadata
+++ b/.atomic.metadata
@@ -1,2 +1,2 @@
 a058fffeb6e63281f8a8d44ab263ed3c3c817347 SOURCES/0b260d3eff505bc1ab60842a34cf9f31857658f4.tar.gz
-d0a6da0d6d62cf0a07e5b67fb9d9ca66fc57e779 SOURCES/64843d3e843b19f41dc44b71da51298fd8a3edb3.tar.gz
+e3726336a3c3eefe5a4f79e3c373942759f507f8 SOURCES/b39a7831b50391a04afc3512a8e94a7f6df26e79.tar.gz
diff --git a/.gitignore b/.gitignore
index d2a98a3..8f8abc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 SOURCES/0b260d3eff505bc1ab60842a34cf9f31857658f4.tar.gz
-SOURCES/64843d3e843b19f41dc44b71da51298fd8a3edb3.tar.gz
+SOURCES/b39a7831b50391a04afc3512a8e94a7f6df26e79.tar.gz
diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec
index 5d2fe14..33f845e 100644
--- a/SPECS/atomic.spec
+++ b/SPECS/atomic.spec
@@ -14,7 +14,7 @@
 %global pylint python3-pylint
 %endif
 
-%global commit0 64843d3e843b19f41dc44b71da51298fd8a3edb3
+%global commit0 b39a7831b50391a04afc3512a8e94a7f6df26e79
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 # Registries package
@@ -25,7 +25,7 @@
 
 Name: atomic
 Epoch: 1
-Version: 1.18.1
+Version: 1.19.1
 Release: 4.git%{shortcommit0}%{?dist}
 Summary: Tool for managing ProjectAtomic systems and containers
 License: LGPLv2+
@@ -63,8 +63,8 @@ Requires: %{pypkg}-setuptools
 Requires: %{pypkg}-six >= 1.3.0
 Requires: %{pypkg}-slip-dbus
 Requires: %{pypkg}-websocket-client >= 0.11.0
-Requires: skopeo >= 1:0.1.23
-Requires: skopeo-containers >= 1:0.1.23
+Requires: skopeo >= 1:0.1.24-1.dev
+Requires: skopeo-containers >= 1:0.1.24-1.dev
 Requires: PyYAML
 Requires: gomtree
 Requires: ostree
@@ -159,7 +159,15 @@ pushd registries-%{commit_atomic_registries}
 %make_install
 install -d %{buildroot}%{_sysconfdir}/containers/
 
-install -p -m 644 registries.conf %{buildroot}%{_sysconfdir}/containers/
+%if 0%{?rhel}
+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
+%endif
 
 install -d %{buildroot}%{_unitdir}
 install -p -m 644  registries.service %{buildroot}%{_unitdir}
@@ -192,8 +200,18 @@ make check
 %{_unitdir}/registries.service
 
 %changelog
-* Thu Sep 21 2017 Johnny Hughes <johnny@centos.org> - 1:1.18.1-4.git64843d3
-- Manual CentOS Debranding
+* Fri Oct 06 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.19.1-4.gitb39a783
+- depend on skopeo >= 1:0.1.24-1.dev (RE: #1499274)
+
+* Wed Sep 20 2017 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:1.19.1-3.gitb39a783
+- rebased to b39a7831b50391a04afc3512a8e94a7f6df26e79
+
+* Tue Aug 29 2017 baude <bbaude@redhat.com> - 1:1.19.1-2.git8fcdfe4
+- Addition of run for system-containers
+
+* Thu Aug 24 2017 Brent Baude <baude@redhat.com> - 1:1.19.1-1.git14e878d
+- New upstream version 1.19.1
+- Fixes BZ #1481967 #1480325 
 
 * Tue Aug 08 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.18.1-4.git64843d3
 - Resolves: #1479551