From c5de18a1f4a2d89f0fcafd7f208a07f3b1ce7733 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 19 2017 13:07:32 +0000 Subject: import atomic-1.20.1-9.git436cf5d.el7 --- diff --git a/.atomic.metadata b/.atomic.metadata index 54271d3..4fc76ff 100644 --- a/.atomic.metadata +++ b/.atomic.metadata @@ -1,2 +1,2 @@ -0a95e3e85c4a9133ec58a5762a8837f10e84043c SOURCES/3f39c11df56fc08004a75776899a08a18dbe6490.tar.gz -25624028f20ab2d63a87fbcee9d6491e3f2c9053 SOURCES/840732d9b858ca998a3e61d3821ecbd260895a84.tar.gz +74a24afceaf475de0daae740030455badbabf6c1 SOURCES/436cf5db54fa72f90694f9c64aa7c8d72328299e.tar.gz +aa086f4b21f8422b2cf2eb90f387c674fd098bbf SOURCES/9e575204be8bf4bff703942f44cbafbec334fa84.tar.gz diff --git a/.gitignore b/.gitignore index 4a7c4e0..fb3fc2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/3f39c11df56fc08004a75776899a08a18dbe6490.tar.gz -SOURCES/840732d9b858ca998a3e61d3821ecbd260895a84.tar.gz +SOURCES/436cf5db54fa72f90694f9c64aa7c8d72328299e.tar.gz +SOURCES/9e575204be8bf4bff703942f44cbafbec334fa84.tar.gz diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec index 9ffc14b..7a26917 100644 --- a/SPECS/atomic.spec +++ b/SPECS/atomic.spec @@ -14,19 +14,19 @@ %global pylint python3-pylint %endif -%global commit0 840732d9b858ca998a3e61d3821ecbd260895a84 +%global commit0 436cf5db54fa72f90694f9c64aa7c8d72328299e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Registries package %global git_atomic_registries https://github.com/projectatomic/registries -%global commit_atomic_registries 3f39c11df56fc08004a75776899a08a18dbe6490 +%global commit_atomic_registries 9e575204be8bf4bff703942f44cbafbec334fa84 %global atomic_registries_shortcommit %(c=%{commit_atomic_registries}; echo ${c:0:7}) Name: atomic Epoch: 1 Version: 1.20.1 -Release: 3.git%{shortcommit0}%{?dist} +Release: 9.git%{shortcommit0}%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/%{name} @@ -85,6 +85,7 @@ The atomic host subcommand wraps rpm-ostree providing unified management. Summary: Parses a global YAML registry file Requires: %{pypkg}-yaml Requires: %{pypkg}-pytoml +Requires: %{pypkg}-setuptools BuildRequires: %{pypkg}-yaml BuildRequires: %{pypkg}-pytoml @@ -154,16 +155,15 @@ pushd registries-%{commit_atomic_registries} make install DESTDIR=%{buildroot} 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 -#%endif -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} @@ -197,8 +197,14 @@ cd .. %{pysitelib}/registries-*.egg-info %changelog -* Mon Dec 11 2017 Johnny Hughes 1:1.20.1-3.git840732d -- Manual CentOS Debranding +* Fri Dec 08 2017 baude - 1:1.20.1-9.git436cf5d +- BZ #1523799 + +* Tue Dec 05 2017 baude - 1:1.20.1-7.git436cf5d +- BZ #1520466 + +* Thu Nov 30 2017 baude - 1:1.20.1-6 +- BZ #1518857 * Wed Nov 22 2017 baude - 1:1.20.1-3.git840732d - Do not install the original markdown man page