diff --git a/.atomic.metadata b/.atomic.metadata index 4738fe5..83c6302 100644 --- a/.atomic.metadata +++ b/.atomic.metadata @@ -1,2 +1,2 @@ -3f92050ad4233737a90e47ab37a1f3fbd180407d SOURCES/5a342e32cd22e57345f32d56e2105a699178b59f.tar.gz +97b007112bfb748705ebb36ada43f47de3058b57 SOURCES/b507039153d03343d501a221270e7e8896cc3ece.tar.gz 18f4c85a1892ab4b6f8c06e6b5e633475bef093d SOURCES/da9a9c87781823f45401ca49da04e269c9e3100e.tar.gz diff --git a/.gitignore b/.gitignore index e920929..25aeace 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/5a342e32cd22e57345f32d56e2105a699178b59f.tar.gz +SOURCES/b507039153d03343d501a221270e7e8896cc3ece.tar.gz SOURCES/da9a9c87781823f45401ca49da04e269c9e3100e.tar.gz diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec index 12a896e..f8eb893 100644 --- a/SPECS/atomic.spec +++ b/SPECS/atomic.spec @@ -14,7 +14,7 @@ %global pylint python3-pylint %endif -%global commit0 5a342e32cd22e57345f32d56e2105a699178b59f +%global commit0 b507039153d03343d501a221270e7e8896cc3ece %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Registries package @@ -25,12 +25,13 @@ Name: atomic Epoch: 1 Version: 1.22.1 -Release: 25.git%{shortcommit0}%{?dist} +Release: 26.git%{shortcommit0}%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/%{name} Source0: https://github.com/projectatomic/%{name}/archive/%{commit0}.tar.gz Source1: https://github.com/projectatomic/registries/archive/%{commit_atomic_registries}.tar.gz +ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 BuildRequires: %{pypkg}-dateutil BuildRequires: %{pypkg}-devel BuildRequires: %{pypkg}-requests >= 2.4.3 @@ -41,11 +42,9 @@ BuildRequires: %{pypkg}-setuptools BuildRequires: policycoreutils-%{pypkg} BuildRequires: git BuildRequires: go-md2man -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.7.4 -%if 0%{?rhel} > 7 +#BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.7.4 BuildRequires: go-toolset-7-golang-bin BuildRequires: go-toolset-7-runtime -%endif BuildRequires: make BuildRequires: rpm-%{pypkg} BuildRequires: PyYAML @@ -75,13 +74,13 @@ BuildRequires: %{pypkg}-ipaddress Requires: %{pypkg}-ipaddress %endif -%if 0%{?fedora} +%if 0%{?centos} || 0%{?fedora} BuildRequires: %{pypkg}-docker Requires: %{pypkg}-docker %else BuildRequires: %{pypkg}-docker-py >= 1.7.2-1 Requires: %{pypkg}-docker-py >= 1.7.2-1 -%endif +%endif # centos %description The goal of Atomic is to provide a high level, coherent entrypoint to the @@ -202,8 +201,8 @@ cd .. %{pysitelib}/registries-*.egg-info %changelog -* Mon Oct 1 2018 Johnny Hughes - 1:1.22.1-25.git5a342e3 -- Fix the python-docker-py requires for CentOS +* Tue Nov 06 2018 Frantisek Kluknavsky - 1:1.22.1-26.gitb507039 +- rebase * Wed Aug 29 2018 Lokesh Mandvekar - 1:1.22.1-25.git5a342e3 - Resolves: #1613325 - depends on python-urllib3