From 614256c50741859de4e4b17963d40a054ba8dd18 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 07 2018 09:34:32 +0000 Subject: import atomic-1.22.1-1.gitd36c015.el7 --- diff --git a/.atomic.metadata b/.atomic.metadata index 4fc76ff..dc5f149 100644 --- a/.atomic.metadata +++ b/.atomic.metadata @@ -1,2 +1,2 @@ -74a24afceaf475de0daae740030455badbabf6c1 SOURCES/436cf5db54fa72f90694f9c64aa7c8d72328299e.tar.gz aa086f4b21f8422b2cf2eb90f387c674fd098bbf SOURCES/9e575204be8bf4bff703942f44cbafbec334fa84.tar.gz +2ba46fe7778b65f7f1a6c747f1b7bc54f33f06df SOURCES/d36c015e7e59ae0c85db77b73343617f7ad96c87.tar.gz diff --git a/.gitignore b/.gitignore index fb3fc2a..b33f4be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/436cf5db54fa72f90694f9c64aa7c8d72328299e.tar.gz SOURCES/9e575204be8bf4bff703942f44cbafbec334fa84.tar.gz +SOURCES/d36c015e7e59ae0c85db77b73343617f7ad96c87.tar.gz diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec index 6bd5f6c..ff93244 100644 --- a/SPECS/atomic.spec +++ b/SPECS/atomic.spec @@ -14,7 +14,7 @@ %global pylint python3-pylint %endif -%global commit0 436cf5db54fa72f90694f9c64aa7c8d72328299e +%global commit0 d36c015e7e59ae0c85db77b73343617f7ad96c87 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Registries package @@ -25,8 +25,8 @@ Name: atomic Epoch: 1 -Version: 1.20.1 -Release: 9.git%{shortcommit0}%{?dist} +Version: 1.22.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/%{name} @@ -155,15 +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 +%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 +%endif +%endif install -d %{buildroot}%{_unitdir} install -p -m 644 registries.service %{buildroot}%{_unitdir} @@ -197,8 +197,11 @@ cd .. %{pysitelib}/registries-*.egg-info %changelog -* Tue Dec 19 2017 Johnny Hughes 1:1.20.1-9.git436cf5d -- Manual CentOS Debranding +* Wed Feb 21 2018 baude - 1:1.22.1-1.gitd36c015 +- V1.22.1 + +* Thu Feb 01 2018 baude - 1:1.21.1-1.git0769006 +- V1.21.1 * Fri Dec 08 2017 baude - 1:1.20.1-9.git436cf5d - BZ #1523799