From dd0aed0147a2f20061e1fe4c1986e3e6db4673ca Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Feb 28 2018 22:36:00 +0000 Subject: Autogenerate some parts using the new macros --- diff --git a/golang-github-hashicorp-serf.spec b/golang-github-hashicorp-serf.spec index 0857994..d767ae1 100644 --- a/golang-github-hashicorp-serf.spec +++ b/golang-github-hashicorp-serf.spec @@ -1,62 +1,26 @@ -%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 - -%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 provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} +# http://github.com/hashicorp/serf +%global provider_prefix github.com/hashicorp/serf +%global gobaseipath %{provider_prefix} %global commit a72c0453da2ba628a013e98bf323a76be4aa1443 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20151109 -Name: golang-%{provider}-%{project}-%{repo} +%gocraftmeta -i + +Name: %{goname} Version: 0.6.4 -Release: 0.8.git%{shortcommit}%{?dist} +Release: 0.9.%{commitdate}git%{shortcommit}%{?dist} Summary: Service orchestration and management tool http://www.serfdom.io 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}} -# 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} +URL: %{gourl} +Source0: %{gosource} %description %{summary} -%if 0%{?with_devel} %package devel Summary: %{summary} 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) @@ -68,142 +32,36 @@ 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) -Requires: golang(github.com/hashicorp/go-msgpack/codec) -Requires: golang(github.com/hashicorp/go-syslog) -Requires: golang(github.com/hashicorp/logutils) -Requires: golang(github.com/hashicorp/mdns) -Requires: golang(github.com/hashicorp/memberlist) -#Requires: golang(github.com/mitchellh/cli) -Requires: golang-github-mitchellh-cli-devel-temporary -Requires: golang(github.com/mitchellh/mapstructure) -Requires: golang(github.com/ryanuber/columnize) -Provides: golang(%{import_path}/client) = %{version}-%{release} -Provides: golang(%{import_path}/command) = %{version}-%{release} -Provides: golang(%{import_path}/command/agent) = %{version}-%{release} -Provides: golang(%{import_path}/coordinate) = %{version}-%{release} -Provides: golang(%{import_path}/serf) = %{version}-%{release} -Provides: golang(%{import_path}/testutil) = %{version}-%{release} +#Requires: golang(github.com/mitchellh/cli) %description devel %{summary} This package contains library source intended for building other packages which use import path with -%{import_path} prefix. -%endif - -%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 -#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 +%{gobaseipath} prefix. %prep -%setup -q -n %{repo}-%{commit} - -%build +%gosetup %install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - 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 - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -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 - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - 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 - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%goinstall %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if %{isgccgoarch} -function gotest { %{gcc_go_test} "$@"; } -%else -%if 0%{?golang_test:1} -function gotest { %{golang_test} "$@"; } -%else -function gotest { go test "$@"; } -%endif -%endif - -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%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 +%gochecks %{gobaseipath}/{command,command/agent,serf} #define license tag if not already defined %{!?_licensedir:%global license %doc} -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE %doc CHANGELOG.md README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test -f unit-test.file-list -%license LICENSE -%doc CHANGELOG.md README.md -%endif %changelog +* Wed Feb 28 2018 Jan Chaloupka - 0.6.4-0.9.20151109gita72c045 +- Autogenerate some parts using the new macros + * Wed Feb 07 2018 Fedora Release Engineering - 0.6.4-0.8.gita72c045 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild