From 0f60ec26224cbce859e2d4251032fd995f2b5ed6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Aug 10 2016 15:34:12 +0000 Subject: NVR: atomic-1.11.0-1.git6ff40cb - built commit 6ff40cb - include build and runtime deps on %%pypkg-dateutil - one liner golang dep Signed-off-by: Lokesh Mandvekar --- diff --git a/.gitignore b/.gitignore index 83d6c5a..d064689 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /72cdbef9734453d8783274872a4dfcd9f03d3b40.tar.gz /1d6aecf1dbbcb88058c39294df7054d9f7fba273.tar.gz /ce09e40922c3f35877d381612280195e445d41c7.tar.gz +/6ff40cbf5e49513555695c7314496cb9fa402c1c.tar.gz diff --git a/atomic.spec b/atomic.spec index 9198c55..62cd2ff 100644 --- a/atomic.spec +++ b/atomic.spec @@ -11,12 +11,12 @@ %global __python %{__python3} %endif -%global commit ce09e40922c3f35877d381612280195e445d41c7 +%global commit 6ff40cbf5e49513555695c7314496cb9fa402c1c %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: atomic -Version: 1.10.5 -Release: 3.git%{shortcommit}%{?dist} +Version: 1.11.0 +Release: 1.git%{shortcommit}%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/atomic @@ -26,7 +26,6 @@ ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 %endif Source0: https://github.com/projectatomic/%{name}/archive/%{commit}.tar.gz - BuildRequires: %{pypkg}-devel BuildRequires: %{pypkg}-requests >= 2.4.3 BuildRequires: %{pypkg}-setuptools @@ -35,10 +34,9 @@ BuildRequires: policycoreutils-%{pypkg} BuildRequires: go-md2man %if 0%{?fedora} BuildRequires: go-srpm-macros -BuildRequires: compiler(go-compiler) -%else -BuildRequires: golang >= 1.4.2 %endif +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: %{pypkg}-dateutil BuildRequires: %{pypkg}-dbus BuildRequires: %{pypkg}-docker-py BuildRequires: rpm-%{pypkg} @@ -49,7 +47,7 @@ BuildRequires: %{pypkg}-gobject-base %endif BuildRequires: ostree-devel %if %{with python3} -BuildRequires: python3-PyYAML +BuildRequires: %{pypkg}-PyYAML %else BuildRequires: PyYAML %endif @@ -63,6 +61,7 @@ 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 @@ -75,12 +74,11 @@ Requires: %{pypkg}-gobject-base Requires: ostree %endif %if %{with python3} -Requires: python3-PyYAML +Requires: %{pypkg}-PyYAML %else Requires: PyYAML %endif - %description The goal of Atomic is to provide a high level, coherent entrypoint to the system, and fill in gaps. @@ -145,6 +143,11 @@ EOF %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.%{name}.conf %changelog +* Wed Aug 10 2016 Lokesh Mandvekar - 1.11.0-1.git6ff40cb +- built commit 6ff40cb +- include build and runtime deps on %%pypkg-dateutil +- one liner golang dep + * Thu Jul 21 2016 Fedora Release Engineering - 1.10.5-3.gitce09e40 - https://fedoraproject.org/wiki/Changes/golang1.7 diff --git a/sources b/sources index 6530da1..e3627a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -126ac7a7e6247aebaacdca87c2c2a145 ce09e40922c3f35877d381612280195e445d41c7.tar.gz +9c5e3c031add2c1e849e5a93e97add11 6ff40cbf5e49513555695c7314496cb9fa402c1c.tar.gz