From bbcbb0742f64c68f547588bddd58ae67871f1a9a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 26 2018 07:34:20 +0000
Subject: import atomic-1.22.1-25.git5a342e3.el7


---

diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec
index 3c5aaac..7112a82 100644
--- a/SPECS/atomic.spec
+++ b/SPECS/atomic.spec
@@ -22,46 +22,45 @@
 %global commit_atomic_registries da9a9c87781823f45401ca49da04e269c9e3100e
 %global atomic_registries_shortcommit %(c=%{commit_atomic_registries}; echo ${c:0:7})
 
-
 Name: atomic
 Epoch: 1
 Version: 1.22.1
-Release: 22.git%{shortcommit0}%{?dist}
+Release: 25.git%{shortcommit0}%{?dist}
 Summary: Tool for managing ProjectAtomic systems and containers
 License: LGPLv2+
 URL: https://github.com/projectatomic/%{name}
 Source0: https://github.com/projectatomic/%{name}/archive/%{commit0}.tar.gz
 Source1: https://github.com/projectatomic/registries/archive/%{commit_atomic_registries}.tar.gz
-
 BuildRequires: %{pypkg}-dateutil
 BuildRequires: %{pypkg}-devel
 BuildRequires: %{pypkg}-requests >= 2.4.3
 BuildRequires: %{pypkg}-setuptools
 BuildRequires: %{pypkg}-tools
-BuildRequires: %{pypkg}-ipaddress
 BuildRequires: %{pypkg}-dbus
-BuildRequires: %{pypkg}-docker-py >= 1.7.2-1
 BuildRequires: %{pypkg}-setuptools
 BuildRequires: policycoreutils-%{pypkg}
 BuildRequires: git
 BuildRequires: go-md2man
 BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.7.4
+%if 0%{?rhel} > 7
+BuildRequires: go-toolset-7-golang-bin
+BuildRequires: go-toolset-7-runtime
+%endif
+BuildRequires: make
 BuildRequires: rpm-%{pypkg}
 BuildRequires: PyYAML
 BuildRequires: ostree-devel
-
 Requires: dbus
 Requires: polkit
 Requires: setup
 Requires: rpm-%{pypkg}
 Requires: %{pypkg}-dateutil
 Requires: %{pypkg}-dbus
-Requires: %{pypkg}-docker-py >= 1.7.2-1
-Requires: %{pypkg}-ipaddress
 Requires: %{pypkg}-requests
 Requires: %{pypkg}-setuptools
 Requires: %{pypkg}-six >= 1.3.0
 Requires: %{pypkg}-slip-dbus
+Requires: %{pypkg}-urllib3
 Requires: %{pypkg}-websocket-client >= 0.11.0
 Requires: skopeo >= 1:0.1.29-3
 Requires: skopeo-containers >= 1:0.1.29-3
@@ -71,6 +70,19 @@ Requires: ostree
 Requires: runc
 Requires: container-storage-setup
 
+%if ! 0%{?fedora}
+BuildRequires: %{pypkg}-ipaddress
+Requires: %{pypkg}-ipaddress
+%endif
+
+%if 0%{?centos} || 0%{?fedora}
+BuildRequires: %{pypkg}-docker
+Requires: %{pypkg}-docker
+%else
+BuildRequires: %{pypkg}-docker-py >= 1.7.2-1
+Requires: %{pypkg}-docker-py >= 1.7.2-1
+%endif # centos
+
 %description
 The goal of Atomic is to provide a high level, coherent entrypoint to the
 system, and fill in gaps.
@@ -93,6 +105,7 @@ BuildRequires: %{pypkg}-pytoml
 %description registries
 Utility that parses a global YAML registry file for container runtimes.
 
+%{?enable_gotoolset7}
 
 %prep
 %setup -qn %{name}-%{commit0}
@@ -102,17 +115,17 @@ tar zxf %{SOURCE1}
 %build
 cd ..
 pushd registries-%{commit_atomic_registries}
-make PYTHON=%{__python} all
+make GO=go PYTHON=%{__python} all
 popd
 pushd atomic-%{commit0}
 if [ %{pypkg} == 'python3' ]; then
     sed -i 's/input = raw_input/pass/' Atomic/util.py
 fi
-make PYTHON=%{__python} PYLINT=true all
+make GO=go PYTHON=%{__python} PYLINT=true all
 popd
 
 %install
-make PYTHON=%{__python} install-only DESTDIR=%{buildroot}
+make GO=go PYTHON=%{__python} install-only DESTDIR=%{buildroot}
 
 %if 0%{?rhel}
 make install-openscap DESTDIR=%{buildroot}
@@ -173,7 +186,9 @@ cd ..
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.%{name}.conf
 %config(noreplace) %{_sysconfdir}/%{name}.conf
+%if 0%{?rhel}
 %config(noreplace) %{_sysconfdir}/%{name}.d/openscap
+%endif
 %dir %{_sysconfdir}/%{name}.d
 
 %files registries
@@ -187,6 +202,15 @@ cd ..
 %{pysitelib}/registries-*.egg-info
 
 %changelog
+* Wed Aug 29 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1:1.22.1-25.git5a342e3
+- Resolves: #1613325 - depends on python-urllib3
+
+* Mon Jun 25 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1:1.22.1-24.git5a342e3
+- additional changes for rhel versions
+
+* Sat Jun 23 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1:1.22.1-23.git5a342e3
+- adjust deps for CentOS Virt SIG
+
 * Mon Jun 18 2018 Dan Walsh <dwalsh@redhat.com> - 1:1.22.1-22.git5a342e3
 - Fix atomix uninstall
 
@@ -255,7 +279,7 @@ cd ..
 - Updated autoconf to make distro support easier
 - Run make check for atomic-registries
 
-* Thu Jun 2 2017 bbaude <bbaude@redhat.com> - 1.18.1
+* Thu Jun 01 2017 bbaude <bbaude@redhat.com> - 1.18.1
 - 1.18.1 release
 - Inclusion of the subpackage for registries