From 56dac8d2319bb03a24141adb5fd148d38cfbe19d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 30 2017 19:06:19 +0000
Subject: import atomic-1.20.1-3.git840732d.el7


---

diff --git a/.atomic.metadata b/.atomic.metadata
index 0e3cce5..54271d3 100644
--- a/.atomic.metadata
+++ b/.atomic.metadata
@@ -1,2 +1,2 @@
-a058fffeb6e63281f8a8d44ab263ed3c3c817347 SOURCES/0b260d3eff505bc1ab60842a34cf9f31857658f4.tar.gz
-ad2d55a460d4110c3b8a83a48c008d3603d39c1d SOURCES/48c224b43c25878b88db0d4dae53cec287d56729.tar.gz
+0a95e3e85c4a9133ec58a5762a8837f10e84043c SOURCES/3f39c11df56fc08004a75776899a08a18dbe6490.tar.gz
+25624028f20ab2d63a87fbcee9d6491e3f2c9053 SOURCES/840732d9b858ca998a3e61d3821ecbd260895a84.tar.gz
diff --git a/.gitignore b/.gitignore
index a79510b..4a7c4e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/0b260d3eff505bc1ab60842a34cf9f31857658f4.tar.gz
-SOURCES/48c224b43c25878b88db0d4dae53cec287d56729.tar.gz
+SOURCES/3f39c11df56fc08004a75776899a08a18dbe6490.tar.gz
+SOURCES/840732d9b858ca998a3e61d3821ecbd260895a84.tar.gz
diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec
index deb568d..86faf85 100644
--- a/SPECS/atomic.spec
+++ b/SPECS/atomic.spec
@@ -14,19 +14,19 @@
 %global pylint python3-pylint
 %endif
 
-%global commit0 48c224b43c25878b88db0d4dae53cec287d56729
+%global commit0 840732d9b858ca998a3e61d3821ecbd260895a84
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 # Registries package
 %global git_atomic_registries https://github.com/projectatomic/registries
-%global commit_atomic_registries 0b260d3eff505bc1ab60842a34cf9f31857658f4
+%global commit_atomic_registries 3f39c11df56fc08004a75776899a08a18dbe6490
 %global atomic_registries_shortcommit %(c=%{commit_atomic_registries}; echo ${c:0:7})
 
 
 Name: atomic
 Epoch: 1
-Version: 1.19.1
-Release: 5.git%{shortcommit0}%{?dist}
+Version: 1.20.1
+Release: 3.git%{shortcommit0}%{?dist}
 Summary: Tool for managing ProjectAtomic systems and containers
 License: LGPLv2+
 URL: https://github.com/projectatomic/%{name}
@@ -83,14 +83,11 @@ The atomic host subcommand wraps rpm-ostree providing unified management.
 # Atomic Registries
 %package registries
 Summary: Parses a global YAML registry file
-Requires: glib2
-Requires: libyaml
-Requires: json-glib
-BuildRequires: libyaml-devel
-BuildRequires: json-glib-devel
-BuildRequires: glib2-devel
-BuildRequires: autoconf
-BuildRequires: automake
+Requires: %{pypkg}-yaml
+Requires: %{pypkg}-pytoml
+
+BuildRequires: %{pypkg}-yaml
+BuildRequires: %{pypkg}-pytoml
 
 %description registries
 Utility that parses a global YAML registry file for container runtimes.
@@ -104,9 +101,7 @@ tar zxf %{SOURCE1}
 %build
 cd ..
 pushd registries-%{commit_atomic_registries}
-sh ./autogen.sh
-%configure
-%make_build
+make PYTHON=%{__python} all
 popd
 pushd atomic-%{commit0}
 if [ %{pypkg} == 'python3' ]; then
@@ -156,7 +151,7 @@ rm -rf %{buildroot}%{_sysconfdir}/containers
 
 cd ..
 pushd registries-%{commit_atomic_registries}
-%make_install
+make install DESTDIR=%{buildroot}
 install -d %{buildroot}%{_sysconfdir}/containers/
 
 %if 0%{?rhel}
@@ -168,16 +163,14 @@ install -p -m 644 registries.redhat %{buildroot}%{_sysconfdir}/containers/regist
   install -p -m 644 registries.conf %{buildroot}%{_sysconfdir}/containers/
 %endif
 %endif
-
 install -d %{buildroot}%{_unitdir}
 install -p -m 644  registries.service %{buildroot}%{_unitdir}
+
 popd
 
 %check
 [ ! -w /run/docker.sock ] || make PYTHON=%{__python} test
 cd ..
-pushd registries-%{commit_atomic_registries}
-make check
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -195,11 +188,23 @@ make check
 %license ../registries-%{commit_atomic_registries}/COPYING 
 %doc ../registries-%{commit_atomic_registries}/README.md
 %{_libexecdir}/registries
+%{_libexecdir}/registries_migrator
 %{_mandir}/man1/registries*
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
 %{_unitdir}/registries.service
+%{pysitelib}/registries
+%{pysitelib}/registries-*.egg-info
 
 %changelog
+* Wed Nov 22 2017 baude <bbaude@redhat.com> - 1:1.20.1-3.git840732d
+- Do not install the original markdown man page
+
+* Tue Nov 21 2017 baude <bbaude@redhat.com> - 1:1.20.1-2.git840732d
+- Fix bug related to the manpage for atomic-registries
+
+* Tue Nov 07 2017 baude <bbaude@redhat.com> - 1:1.20.1-1.git840732d
+- New upstream atomic and registries packages
+
 * Fri Oct 13 2017 baude <bbaude@redhat.com> - 1:1.19.1-5.gitb39a783
 - BZ #1500961