From c3eaa8bc2e044be5f121be075a6014e768604e1d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 06 2016 17:24:16 +0000 Subject: import atomic-1.13.8-1.el7 --- diff --git a/.atomic.metadata b/.atomic.metadata index 4116c60..49b488f 100644 --- a/.atomic.metadata +++ b/.atomic.metadata @@ -1 +1 @@ -c8218cd6d871b599c595473f70ce643f1832a388 SOURCES/b807043930debd3b067ee4234c612872322c8df2.tar.gz +056fcd48d83737477b3f294fef90a099fc297be8 SOURCES/8046db29993e35ad1c30a6cf88d79b9f53fbe215.tar.gz diff --git a/.gitignore b/.gitignore index 87f856d..e4e9e4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/b807043930debd3b067ee4234c612872322c8df2.tar.gz +SOURCES/8046db29993e35ad1c30a6cf88d79b9f53fbe215.tar.gz diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec index 50b4dc6..4cd49ae 100644 --- a/SPECS/atomic.spec +++ b/SPECS/atomic.spec @@ -13,13 +13,13 @@ %global pylint python3-pylint %endif -%global commit0 b807043930debd3b067ee4234c612872322c8df2 +%global commit0 8046db29993e35ad1c30a6cf88d79b9f53fbe215 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: atomic Epoch: 1 -Version: 1.12.5 -Release: 2%{?dist} +Version: 1.13.8 +Release: 1%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/%{name} @@ -54,7 +54,7 @@ Requires: %{pypkg}-ipaddress Requires: %{pypkg}-docker-py >= 1.7.2-1 Requires: %{pypkg}-websocket-client >= 0.11.0 Requires: %{pypkg}-six >= 1.3.0 -Requires: skopeo >= 1:0.1.13-7 +Requires: skopeo >= 1:0.1.17-0.4 Requires: PyYAML %description @@ -113,6 +113,9 @@ EOF '%{_datadir}/polkit-1/actions/org.%{name}.policy' \ '%{_mandir}/man1/%{name}*' +#moved to skopeo - should not be present in future tarballs +rm -rf %{buildroot}%{_sysconfdir}/containers + %check [ ! -w /run/docker.sock ] || make PYTHON=%{__python} test @@ -121,14 +124,52 @@ EOF %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}.conf -%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/%{name}.d/openscap %dir %{_sysconfdir}/%{name}.d -%dir %{_sysconfdir}/containers -%dir %{_sysconfdir}/containers/registries.d -%dir %{_sharedstatedir}/%{name}/sigstore %changelog +* Mon Nov 07 2016 Lokesh Mandvekar - 1:1.13.8-1 +- bump to v1.13.8 +- built commit 8046db2 + +* Thu Nov 03 2016 Lokesh Mandvekar - 1:1.13.7-2 +- built commit 4c3ea60 + +* Thu Nov 03 2016 Lokesh Mandvekar - 1:1.13.7-1 +- Resolves: #1377952 +- bump to v1.13.7 +- built commit 1d01980 + +* Tue Nov 01 2016 Lokesh Mandvekar - 1:1.13.6-1 +- bump to v1.13.6 +- built commit a45a2a9 + +* Mon Oct 31 2016 Lokesh Mandvekar - 1:1.13.5-1 +- bump to v1.13.5 +- built commit 3d9567b + +* Sat Oct 29 2016 Lokesh Mandvekar - 1:1.13.4-1 +- bump to v1.13.4 +- built commit 0331180 + +* Thu Oct 27 2016 Lokesh Mandvekar - 1:1.13.3-1 +- bump to v1.13.3 +- built commit 5a075e8 + +* Tue Oct 18 2016 Lokesh Mandvekar - 1:1.13.1-3 +- needs skopeo >= 0.1.17-0.4 + +* Tue Oct 18 2016 Frantisek Kluknavsky - 1:1.13.1-2 +- do not package /etc/containers - moved to skopeo + +* Tue Oct 11 2016 Lokesh Mandvekar - 1:1.13.1-1 +- bump to v1.13.1 +- built commit 4445c41 - tag v1.13.1 + +* Mon Oct 10 2016 Lokesh Mandvekar - 1:1.13.0-1 +- Resolves: #1383452 - rebase to v1.13.0 +- built commit 71d0ccb + * Mon Sep 26 2016 Lokesh Mandvekar - 1:1.12.5-2 - install /var/lib/atomic/sigstore