From 2f2e759b23e83b1caa7fdfd1fe0ce592f7d466eb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 14 2018 16:41:17 +0000 Subject: import atomic-1.22.1-3.git2fd0860.el7 --- diff --git a/.atomic.metadata b/.atomic.metadata index dc5f149..18f611a 100644 --- a/.atomic.metadata +++ b/.atomic.metadata @@ -1,2 +1,2 @@ -aa086f4b21f8422b2cf2eb90f387c674fd098bbf SOURCES/9e575204be8bf4bff703942f44cbafbec334fa84.tar.gz -2ba46fe7778b65f7f1a6c747f1b7bc54f33f06df SOURCES/d36c015e7e59ae0c85db77b73343617f7ad96c87.tar.gz +00f5d8bb1aad703c71f4f8f7224d8adc8ef65a45 SOURCES/2fd08606a96e32d90751bd0a703c0b389d306121.tar.gz +18f4c85a1892ab4b6f8c06e6b5e633475bef093d SOURCES/da9a9c87781823f45401ca49da04e269c9e3100e.tar.gz diff --git a/.gitignore b/.gitignore index b33f4be..00db56f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/9e575204be8bf4bff703942f44cbafbec334fa84.tar.gz -SOURCES/d36c015e7e59ae0c85db77b73343617f7ad96c87.tar.gz +SOURCES/2fd08606a96e32d90751bd0a703c0b389d306121.tar.gz +SOURCES/da9a9c87781823f45401ca49da04e269c9e3100e.tar.gz diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec index ff93244..78c3350 100644 --- a/SPECS/atomic.spec +++ b/SPECS/atomic.spec @@ -14,19 +14,19 @@ %global pylint python3-pylint %endif -%global commit0 d36c015e7e59ae0c85db77b73343617f7ad96c87 +%global commit0 2fd08606a96e32d90751bd0a703c0b389d306121 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Registries package %global git_atomic_registries https://github.com/projectatomic/registries -%global commit_atomic_registries 9e575204be8bf4bff703942f44cbafbec334fa84 +%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: 1.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/%{name} @@ -63,8 +63,8 @@ Requires: %{pypkg}-setuptools Requires: %{pypkg}-six >= 1.3.0 Requires: %{pypkg}-slip-dbus Requires: %{pypkg}-websocket-client >= 0.11.0 -Requires: skopeo >= 1:0.1.24-1.dev -Requires: skopeo-containers >= 1:0.1.24-1.dev +Requires: skopeo >= 1:0.1.29-3 +Requires: skopeo-containers >= 1:0.1.29-3 Requires: PyYAML Requires: gomtree Requires: ostree @@ -155,15 +155,6 @@ 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 -d %{buildroot}%{_unitdir} install -p -m 644 registries.service %{buildroot}%{_unitdir} @@ -191,12 +182,18 @@ cd .. %{_libexecdir}/registries %{_libexecdir}/registries_migrator %{_mandir}/man1/registries* -%config(noreplace) %{_sysconfdir}/containers/registries.conf %{_unitdir}/registries.service %{pysitelib}/registries %{pysitelib}/registries-*.egg-info %changelog +* Tue Apr 10 2018 Lokesh Mandvekar - 1:1.22.1-3.git2fd0860 +- move registries.conf to skopeo +- built atomic-registries commit da9a9c8 + +* Tue Apr 10 2018 Lokesh Mandvekar - 1:1.22.1-2.git2fd0860 +- built commit 2fd0860 + * Wed Feb 21 2018 baude - 1:1.22.1-1.gitd36c015 - V1.22.1