From 348957fb4a8b940330ba4a53727423b679c5a7b4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 21 2017 20:01:44 +0000 Subject: import atomic-1.18.1-4.git64843d3.el7 --- diff --git a/.atomic.metadata b/.atomic.metadata index dc79e1f..16c0a65 100644 --- a/.atomic.metadata +++ b/.atomic.metadata @@ -1,2 +1,2 @@ -5114e4ba6e979e06f1e49fbbd8394a1fe32f46b5 SOURCES/0705b1bde7d308988263cd5ef1106ce2901a7e00.tar.gz a058fffeb6e63281f8a8d44ab263ed3c3c817347 SOURCES/0b260d3eff505bc1ab60842a34cf9f31857658f4.tar.gz +d0a6da0d6d62cf0a07e5b67fb9d9ca66fc57e779 SOURCES/64843d3e843b19f41dc44b71da51298fd8a3edb3.tar.gz diff --git a/.gitignore b/.gitignore index f1fae0f..d2a98a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/0705b1bde7d308988263cd5ef1106ce2901a7e00.tar.gz SOURCES/0b260d3eff505bc1ab60842a34cf9f31857658f4.tar.gz +SOURCES/64843d3e843b19f41dc44b71da51298fd8a3edb3.tar.gz diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec index 3b43a15..e68ca0c 100644 --- a/SPECS/atomic.spec +++ b/SPECS/atomic.spec @@ -14,7 +14,7 @@ %global pylint python3-pylint %endif -%global commit0 0705b1bde7d308988263cd5ef1106ce2901a7e00 +%global commit0 64843d3e843b19f41dc44b71da51298fd8a3edb3 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Registries package @@ -26,7 +26,7 @@ Name: atomic Epoch: 1 Version: 1.18.1 -Release: 3.1.git%{shortcommit0}%{?dist} +Release: 4.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.17-1 -Requires: skopeo-containers >= 1:0.1.17-1 +Requires: skopeo >= 1:0.1.23 +Requires: skopeo-containers >= 1:0.1.23 Requires: PyYAML Requires: gomtree Requires: ostree @@ -200,6 +200,10 @@ make check %{_unitdir}/registries.service %changelog +* Tue Aug 08 2017 Lokesh Mandvekar - 1:1.18.1-4.git64843d3 +- Resolves: #1479551 +- depend on skopeo >= 1:0.1.23 + * Thu Jun 22 2017 bbaude - 1:1.18.1-3.1.git0705b1b - Fix conditional distro logic for registires.conf - Fixes Bugzilla #1464029