From a24076d3db74ce1c3878f3e395cfc7022b1f4b17 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jan 12 2017 10:50:32 +0000 Subject: Polish the spec file - related: #1250511 --- diff --git a/golang-github-smartystreets-goconvey.spec b/golang-github-smartystreets-goconvey.spec index b98a6b8..85e4f89 100644 --- a/golang-github-smartystreets-goconvey.spec +++ b/golang-github-smartystreets-goconvey.spec @@ -1,18 +1,29 @@ -%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 # cyclic dependency between golang-github-smartystreets-goconvey and # golang-github-smartystreets-assertions %global with_check 0 +# 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 @@ -32,14 +43,14 @@ Name: golang-%{provider}-%{project}-%{repo} Version: 1.6.1 -Release: 0.2.git%{shortcommit}%{?dist} +Release: 0.3.git%{shortcommit}%{?dist} Summary: Behavioral testing in the browser, integrates with go test License: MIT 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} @@ -60,6 +71,7 @@ BuildRequires: golang(github.com/smartystreets/assertions) Requires: golang(github.com/jtolds/gls) Requires: golang(github.com/smartystreets/assertions) + Provides: golang(%{import_path}/convey) = %{version}-%{release} Provides: golang(%{import_path}/convey/gotest) = %{version}-%{release} Provides: golang(%{import_path}/convey/reporting) = %{version}-%{release} @@ -173,6 +185,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Thu Jan 12 2017 Jan Chaloupka - 1.6.1-0.3.gitbf58a9a +- Polish the spec file + related: #1250511 + * Thu Jul 21 2016 Fedora Release Engineering - 1.6.1-0.2.gitbf58a9a - https://fedoraproject.org/wiki/Changes/golang1.7