From 2972077913a6dca0ceab65813a0a5c8a1cc47177 Mon Sep 17 00:00:00 2001
From: Brent Baude <bbaude@redhat.com>
Date: Jun 05 2017 14:34:17 +0000
Subject: Updated autoconf stuff for atomic-registries. And distro specific conf files


---

diff --git a/atomic.spec b/atomic.spec
index ff08782..7cb0c77 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -11,12 +11,12 @@
 %global __python %{__python3}
 %endif
 
-%global commit 6df73db868e6cd5f880be330a556815dd43f249a
+%global commit 0705b1bde7d308988263cd5ef1106ce2901a7e00
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 # Registries package
 %global git_atomic_registries https://github.com/projectatomic/registries
-%global commit_atomic_registries 1eff66fed361d26664783dffcc5ec765f1c33ad4
+%global commit_atomic_registries c8b4191f1c86b3dd9caa7721e32f50141b977fe2
 %global atomic_registries_shortcommit %(c=%{commit_atomic_registries}; echo ${c:0:7})
 
 
@@ -178,7 +178,14 @@ cd ..
 pushd registries-%{commit_atomic_registries}
 %make_install
 install -d %{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
+
 install -d %{buildroot}%{_unitdir}
 install -p -m 644  registries.service %{buildroot}%{_unitdir}
 popd
@@ -214,6 +221,9 @@ make check
 * Mon Jun 05 2017 bbaude <bbaude@redhat.com> - 1.18.1-3
 - Revert to using %setup again
 - BZ#1458431
+- Customized registries.conf file based on distro
+- Updated autoconf to make distro support easier
+- Run make check for atomic-registries
 
 * Thu Jun 1 2017 dwalsh <dwalsh@redhat.com> - 1.18.1-2
 - 1.18.1 release