From a9e8b72dad8a6ea6061bb171ec4ab7e95acd5327 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sep 21 2016 13:57:15 +0000 Subject: NVR: atomic-1.12.3-1.git1cd5ba9 - Resolves: #1376961 - bump to v1.12.3 - built commit 1cd5ba9 Signed-off-by: Lokesh Mandvekar --- diff --git a/.gitignore b/.gitignore index 4f8c23e..a32a502 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /6ff40cbf5e49513555695c7314496cb9fa402c1c.tar.gz /f9b3c6cc72c004039200411734a03f41258d02c2.tar.gz /f3c036888b90b6131e9a75227e9c8f4837cc37c7.tar.gz +/1cd5ba96b749ea26b60f935dff62ef7818562bfd.tar.gz diff --git a/atomic.spec b/atomic.spec index e233704..28b2976 100644 --- a/atomic.spec +++ b/atomic.spec @@ -11,12 +11,12 @@ %global __python %{__python3} %endif -%global commit f3c036888b90b6131e9a75227e9c8f4837cc37c7 +%global commit 1cd5ba96b749ea26b60f935dff62ef7818562bfd %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: atomic -Version: 1.12.1 -Release: 1%{?dist} +Version: 1.12.3 +Release: 1i.git%{shortcommit}%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/atomic @@ -60,11 +60,11 @@ Requires: skopeo >= 0.1.14-1 Requires: runc Requires: rpm-%{pypkg} # https://github.com/projectatomic/atomic/pull/180 -Requires: %{pypkg}-setuptools Requires: %{pypkg}-dateutil Requires: %{pypkg}-dbus -Requires: %{pypkg}-requests >= 2.4.3 Requires: %{pypkg}-docker-py >= 1.7.2 +Requires: %{pypkg}-requests >= 2.4.3 +Requires: %{pypkg}-setuptools Requires: %{pypkg}-websocket-client >= 0.11.0 Requires: %{pypkg}-six >= 1.3.0 %if (0%{?rhel} != 0 && 0%{?rhel} <= 7) @@ -98,7 +98,6 @@ fi %build make PYTHON=%{__python} PYLINT=true all -make PYTHON=%{__python} docs %install make PYTHON=%{__python} install-only DESTDIR=%{buildroot} @@ -141,8 +140,17 @@ EOF %doc COPYING README.md %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 +%dir %{_sysconfdir}/%{name}.d +%dir %{_sysconfdir}/containers +%dir %{_sysconfdir}/containers/registries.d %changelog +* Wed Sep 21 2016 Lokesh Mandvekar - 1.12.3-1.git1cd5ba9 +- Resolves: #1376961 - bump to v1.12.3 +- built commit 1cd5ba9 + * Tue Sep 13 2016 Lokesh Mandvekar - 1.12.1-1 - rebase to v1.12.1 diff --git a/sources b/sources index 462da54..83b3c2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11e42bdaf9d54d8469dfb5446caafe0f f3c036888b90b6131e9a75227e9c8f4837cc37c7.tar.gz +9cd8087194ee12db32a4c7d2539ed1b3 1cd5ba96b749ea26b60f935dff62ef7818562bfd.tar.gz