From 4987112bc06ba2c335e9f91e51b77905dba28913 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Feb 13 2019 16:15:21 +0000 Subject: use go-toolset-1.10 on CentOS, build on i386 --- diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 27c598c..dc98fff 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -37,9 +37,9 @@ Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar. # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} -ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 +ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 %{ix86} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -%if 0%{?fedora} || 0%{?centos} +%if 0%{?fedora} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} %else BuildRequires: go-toolset-1.10 @@ -287,6 +287,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_mandir}/man1/docker*.1* %changelog +* Wed Feb 13 2019 Johnny Hughes +- Build on i386, use golang toolset on CentOS + * Fri Dec 14 2018 Frantisek Kluknavsky - 0.12.1.2-2.git9551f6b - rebase