From 223915d1b86d7bf974d1a4788362bb1c27c056b1 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Aug 24 2015 11:13:08 +0000 Subject: Update spec file to spec-2.0 - resolves: #1250477 --- diff --git a/golang-github-hashicorp-serf.spec b/golang-github-hashicorp-serf.spec index f2d9dd7..5420e25 100644 --- a/golang-github-hashicorp-serf.spec +++ b/golang-github-hashicorp-serf.spec @@ -1,33 +1,77 @@ +%if 0%{?fedora} || 0%{?rhel} == 6 +%global with_devel 1 +%global with_bundled 0 +%global with_debug 0 +%global with_check 1 +%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 +%else %global debug_package %{nil} +%endif + +%define copying() \ +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \ +%license %{*} \ +%else \ +%doc %{*} \ +%endif + +%global isgccgoarch 0 +%if 0%{?gccgo_arches:1} +%ifarch %{gccgo_arches} +%global isgccgoarch 1 +%endif +%endif + %global provider github %global provider_tld com %global project hashicorp %global repo serf # https://github.com/hashicorp/serf -%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} %global commit 4bd6183181bad5ae211029873279fb74ceace07c %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: golang-%{provider}-%{project}-%{repo} Version: 0 -Release: 0.2.git%{shortcommit}%{?dist} +Release: 0.3.git%{shortcommit}%{?dist} Summary: Service orchestration and management tool http://www.serfdom.io License: MPLv2.0 -URL: https://%{import_path} -Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +URL: https://%{provider_prefix} +Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -BuildArch: noarch +# If go_arches not defined fall through to implicit golang archs +%if 0%{?go_arches:1} +ExclusiveArch: %{go_arches} %else -ExclusiveArch: %{ix86} x86_64 %{arm} +ExclusiveArch: %{ix86} x86_64 %{arm} +%endif +# If gccgo_arches does not fit or is not defined fall through to golang +%if %{isgccgoarch} +BuildRequires: gcc-go >= %{gccgo_min_vers} +%else +BuildRequires: golang %endif %description %{summary} +%if 0%{?with_devel} %package devel Summary: %{summary} -BuildRequires: golang >= 1.2.1-3 +BuildArch: noarch + +%if 0%{?with_check} BuildRequires: golang(github.com/armon/circbuf) BuildRequires: golang(github.com/armon/go-metrics) BuildRequires: golang(github.com/hashicorp/go-msgpack/codec) @@ -39,6 +83,7 @@ BuildRequires: golang(github.com/hashicorp/memberlist) BuildRequires: golang-github-mitchellh-cli-devel-temporary BuildRequires: golang(github.com/mitchellh/mapstructure) BuildRequires: golang(github.com/ryanuber/columnize) +%endif Requires: golang(github.com/armon/circbuf) Requires: golang(github.com/armon/go-metrics) @@ -62,7 +107,40 @@ Provides: golang(%{import_path}/testutil) = %{version}-%{release} %{summary} This package contains library source intended for -building other packages which use %{project}/%{repo}. +building other packages which use import path with +%{import_path} prefix. +%endif + +%if 0%{?with_unit_test} +%package unit-test +Summary: Unit tests for %{name} package +# If go_arches not defined fall through to implicit golang archs +%if 0%{?go_arches:1} +ExclusiveArch: %{go_arches} +%else +ExclusiveArch: %{ix86} x86_64 %{arm} +%endif +# If gccgo_arches does not fit or is not defined fall through to golang +%if %{isgccgoarch} +BuildRequires: gcc-go >= %{gccgo_min_vers} +%else +BuildRequires: golang +%endif + +%if 0%{?with_check} +#Here comes all BuildRequires: PACKAGE the unit tests +#in %%check section need for running +%endif + +# test subpackage tests code from devel subpackage +Requires: %{name}-devel = %{version}-%{release} + +%description unit-test +%{summary} + +This package contains unit tests for project +providing packages with %{import_path} prefix. +%endif %prep %setup -q -n %{repo}-%{commit} @@ -70,36 +148,72 @@ building other packages which use %{project}/%{repo}. %build %install +# source codes for building projects +%if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/ - -rm -rf website ops-misc +# find all *.go but no *_test.go files and generate devel.file-list +for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list +done +%endif -# copy directories -for file in ./* ; do - if [ -d $file ]; then - cp -rpav $file %{buildroot}%{gopath}/src/%{import_path}/ - fi +# testing files for this project +%if 0%{?with_unit_test} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +# find all *_test.go files and generate unit-test.file-list +for file in $(find . -iname "*_test.go"); do + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list done +%endif %check -GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path} -#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/command -#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/command/agent -#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/serf -GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/testutil - -%files devel -%if 0%{?fedora} -%license LICENSE +%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} +%if %{isgccgoarch} +function gotest { %{gcc_go_test} "$@"; } %else -%doc LICENSE +%if 0%{?golang_test:1} +function gotest { %{golang_test} "$@"; } +%else +function gotest { go test "$@"; } +%endif %endif + +export GOPATH=%{buildroot}/%{gopath}:%{gopath} +gotest %{import_path} +# --- FAIL: TestForceLeaveCommandRun (0.16s) +#gotest %%{import_path}/command +# --- FAIL: TestSyslogFilter (0.00s) +# syslog_test.go:17: err: Unix syslog delivery error +#gotest %%{import_path}/command/agent +# --- FAIL: TestSerf_Join_IgnoreOld (0.08s) +# --- FAIL: TestSerf_SnapshotRecovery (0.72s) +#gotest %%{import_path}/serf +gotest %{import_path}/testutil +%endif + +%if 0%{?with_devel} +%files devel -f devel.file-list +%copying LICENSE %doc CHANGELOG.md README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%{gopath}/src/%{import_path} +%dir %{gopath}/src/%{import_path} +%endif + +%if 0%{?with_unit_test} +%files unit-test -f unit-test.file-list +%copying LICENSE +%doc CHANGELOG.md README.md +%endif %changelog +* Mon Aug 24 2015 jchaloup - 0-0.3.git4bd6183 +- Update spec file to spec-2.0 + resolves: #1250477 + * Thu Jul 16 2015 jchaloup - 0-0.2.git4bd6183 - Disable command test related: #1212318