From 35f3217cf60e73d44c30bdc4708bae12730dd3e4 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Nov 14 2018 19:09:28 +0000 Subject: Update to new go packaging Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index f7d9e2c..757d5ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /go-etcd-68b33a3.tar.gz +/go-etcd-2.0.0.tar.gz diff --git a/golang-github-coreos-go-etcd.spec b/golang-github-coreos-go-etcd.spec index 189ff56..8ed609d 100644 --- a/golang-github-coreos-go-etcd.spec +++ b/golang-github-coreos-go-etcd.spec @@ -1,184 +1,66 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 -%global with_devel 1 -%global with_bundled 0 -%global with_debug 0 -# needs etcd running -%global with_check 0 -%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 +# Run tests in check section +# Needs etcd running +%bcond_with check -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif +# https://github.com/coreos/go-etcd +%global goipath github.com/coreos/go-etcd +Version: 2.0.0 -%global isgccgoarch 0 -%if 0%{?gccgo_arches:1} -%ifarch %{gccgo_arches} -%global isgccgoarch 1 -%endif -%endif +%global common_description %{expand: +Go client library for etcd.} -%global provider github -%global provider_tld com -%global project coreos -%global repo go-etcd -# https://github.com/coreos/go-etcd -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 68b33a3ba02a45d5f98bd7952e3e63e653a38252 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} -Version: 2.0.0 -Release: 0.13.git%{shortcommit}%{?dist} +%gometa + +Name: golang-github-coreos-go-etcd +Release: 1%{?dist} Summary: Go client library for etcd +# Detected licences +# - *No copyright* Apache License (v2.0) at 'LICENSE' License: ASL 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -Patch0: change-default-ports.patch +URL: %{gourl} +Source0: %{gosource} -# 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} +BuildRequires: golang(github.com/ugorji/go/codec) %description -%{summary} +%{common_description} + -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} -BuildRequires: golang(github.com/ugorji/go/codec) -%endif - -Requires: golang(github.com/ugorji/go/codec) - -Provides: golang(%{import_path}/etcd) = %{version}-%{release} - %description devel -%{summary} +%{common_description} 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} +%{goipath} prefix. -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif %prep -%setup -q -n %{repo}-%{commit} -%patch0 -p1 +%forgeautosetup -%build %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 - 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 - 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 -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%if %{with check} %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} +%gochecks %endif -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path}/etcd -%endif -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE %doc 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 README.md -%endif %changelog +* Wed Nov 14 2018 Robert-André Mauchin - 2.0.0-1 +- Update to new go packaging + * Fri Jul 13 2018 Fedora Release Engineering - 2.0.0-0.13.git68b33a3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild @@ -259,4 +141,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} * Wed Aug 20 2014 Adam Miller - 0.2.0-0.1-rc1 - Initial fedora package - diff --git a/sources b/sources index 5ad7009..840cfb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80c7ece24a2a13bf73459499233282a9 go-etcd-68b33a3.tar.gz +SHA512 (go-etcd-2.0.0.tar.gz) = 6cbad346080d6c7100954ff40bae82ba796cff7f9a4883dc7d19544c2b3634727a92b3044a409d27f9ff54d27af397f7682dd2480e4ef3352175a2db861ce4cf