From 98185fedfe7924fec7fcc1a70b8ee4ed01059b8d Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jan 12 2017 14:21:16 +0000 Subject: Polish the spec file - related: #1250466 --- diff --git a/golang-github-hashicorp-go-multierror.spec b/golang-github-hashicorp-go-multierror.spec index def2786..55051ea 100644 --- a/golang-github-hashicorp-go-multierror.spec +++ b/golang-github-hashicorp-go-multierror.spec @@ -1,16 +1,27 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 +# If any of the following macros should be set otherwise, +# you can wrap any of them with the following conditions: +# - %%if 0%%{centos} == 7 +# - %%if 0%%{?rhel} == 7 +# - %%if 0%%{?fedora} == 23 +# Or just test for particular distribution: +# - %%if 0%%{centos} +# - %%if 0%%{?rhel} +# - %%if 0%%{?fedora} +# +# Be aware, on centos, both %%rhel and %%centos are set. If you want to test +# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. +# (Don't forget to replace double percentage symbol with single one in order to apply a condition) + +# Generate devel rpm %global with_devel 1 +# Build project from bundled dependencies %global with_bundled 0 +# Build with debug info rpm %global with_debug 0 +# Run tests in check section %global with_check 1 +# Generate unit-test rpm %global with_unit_test 1 -%else -%global with_devel 0 -%global with_bundled 0 -%global with_debug 0 -%global with_check 0 -%global with_unit_test 0 -%endif %if 0%{?with_debug} %global _dwz_low_mem_die_limit 0 @@ -30,14 +41,14 @@ Name: golang-%{provider}-%{project}-%{repo} Version: 0 -Release: 0.8.git%{shortcommit}%{?dist} +Release: 0.9.git%{shortcommit}%{?dist} Summary: Package for representing a list of errors as a single error License: MPLv2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} +ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -68,8 +79,6 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test Summary: Unit tests for %{name} package -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests @@ -154,6 +163,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Thu Jan 12 2017 Jan Chaloupka - 0-0.9.gitd30f099 +- Polish the spec file + related: #1250466 + * Thu Jul 21 2016 Fedora Release Engineering - 0-0.8.gitd30f099 - https://fedoraproject.org/wiki/Changes/golang1.7