diff --git a/.gitignore b/.gitignore index af4356a..f846a40 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /e5734c48df7bb1948657b2687488ca63cca9aafc.tar.gz /fea1b998de5d96924c633b354ceaaa1aa66a313d.tar.gz /52d695cadae01ecbc6ba2755ad1fdfecc3a8e252.tar.gz +/5f631c850c9d48957dda84da5bf2459568b60660.tar.gz diff --git a/atomic.spec b/atomic.spec index 7f7894b..f6d72d8 100644 --- a/atomic.spec +++ b/atomic.spec @@ -1,8 +1,9 @@ %global debug_package %{nil} -%if 0%{?rhel} != 0 && 0%{?rhel} <= 7 +%if 0%{?fedora} <= 22 || (0%{?rhel} != 0 && 0%{?rhel} <= 7) %global pypkg python %global pysitelib %{python_sitelib} %global __python %{__python2} +%global pylint pylint %else %global pypkg python3 %global pysitelib %{python3_sitelib} @@ -10,41 +11,42 @@ %global pylint python3-pylint %endif -%global commit 52d695cadae01ecbc6ba2755ad1fdfecc3a8e252 +%global commit 5f631c850c9d48957dda84da5bf2459568b60660 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Name: atomic -Version: 1.0 -Release: 1.git%{shortcommit}%{?dist} -Summary: Tool for managing ProjectAtomic systems and containers -License: LGPLv2+ -URL: https://github.com/projectatomic/atomic -ExclusiveArch: x86_64 -Source0: https://github.com/projectatomic/%{name}/archive/%{commit}.tar.gz +Name: atomic +Version: 1.1 +Release: 1.git%{shortcommit}%{?dist} +Summary: Tool for managing ProjectAtomic systems and containers +License: LGPLv2+ +URL: https://github.com/projectatomic/atomic +ExclusiveArch: x86_64 +Source0: https://github.com/projectatomic/%{name}/archive/%{commit}.tar.gz -BuildRequires: %{pypkg}-devel +BuildRequires: %{pypkg}-devel %if 0%{?rhel} != 0 && 0%{?rhel} <= 7 %else -BuildRequires: %{pypkg}-pylint +BuildRequires: %{pylint} %endif -BuildRequires: %{pypkg}-requests -BuildRequires: %{pypkg}-setuptools -BuildRequires: %{pypkg}-tools -BuildRequires: go-md2man +BuildRequires: %{pypkg}-requests +BuildRequires: %{pypkg}-setuptools +BuildRequires: %{pypkg}-tools +BuildRequires: policycoreutils-%{pypkg} +BuildRequires: go-md2man %if 0%{?rhel} != 0 && 0%{?rhel} <= 7 BuildRequires: docker-python %else -BuildRequires: %{pypkg}-docker-py +BuildRequires: %{pypkg}-docker-py %endif -Requires: dbus -Requires: docker -Requires: polkit -Requires: setup -Requires: %{pypkg}-requests -Requires: %{pypkg}-docker-py -Requires: %{pypkg}-websocket-client >= 0.11.0 -Requires: %{pypkg}-six >= 1.3.0 +Requires: dbus +Requires: docker +Requires: polkit +Requires: setup +Requires: %{pypkg}-requests +Requires: %{pypkg}-docker-py +Requires: %{pypkg}-websocket-client >= 0.11.0 +Requires: %{pypkg}-six >= 1.3.0 %description @@ -62,10 +64,10 @@ management. %setup -qn %{name}-%{commit} %build -make PYTHON=%{__python} PYLINT=%{?pylint} all +make PYTHON=%{__python} PYLINT=%{pylint} all %install -make PYTHON=%{__python} PYLINT=%{?pylint} install DESTDIR=%{buildroot} +make PYTHON=%{__python} PYLINT=%{pylint} install DESTDIR=%{buildroot} %check [ ! -w /run/docker.sock ] || make PYTHON=%{__python} test @@ -86,6 +88,10 @@ make PYTHON=%{__python} PYLINT=%{?pylint} install DESTDIR=%{buildroot} %changelog +* Mon Aug 03 2015 Lokesh Mandvekar - 1.1-1.git5f631c8 +- bump to 1.1 +- buildrequires policycoreutils-python(3) + * Fri Jul 24 2015 Lokesh Mandvekar - 1.0-1.git52d695c - version 1.0 as per setup.py - use latest upstream master commit diff --git a/sources b/sources index 66949c2..9633baa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f89b8a90af6c74ba06a09c88287082e1 52d695cadae01ecbc6ba2755ad1fdfecc3a8e252.tar.gz +2cb083be0320d3a618fabc22e123c0aa 5f631c850c9d48957dda84da5bf2459568b60660.tar.gz