From 4293aa9b34ad6e67efee8f09a9bb46e5c8edf22f Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Sep 12 2015 19:48:10 +0000 Subject: Update to spec-2.1 - resolves: #1250461 --- diff --git a/golang-github-grpc-grpc-go.spec b/golang-github-grpc-grpc-go.spec index 02ad523..d8ad80c 100644 --- a/golang-github-grpc-grpc-go.spec +++ b/golang-github-grpc-grpc-go.spec @@ -18,13 +18,6 @@ %global debug_package %{nil} %endif -%define copying() \ -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \ -%license %{*} \ -%else \ -%doc %{*} \ -%endif - %global provider github %global provider_tld com %global project grpc @@ -37,24 +30,16 @@ Name: golang-%{provider}-%{project}-%{repo} Version: 0 -Release: 0.1.git%{shortcommit}%{?dist} +Release: 0.2.git%{shortcommit}%{?dist} Summary: The Go language implementation of gRPC. HTTP/2 based RPC License: BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -# 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 -%ifarch 0%{?gccgo_arches} -BuildRequires: gcc-go >= %{gccgo_min_vers} -%else -BuildRequires: golang -%endif +# 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} %description %{summary} @@ -111,21 +96,11 @@ building other packages which use import path with %{import_path} prefix. %endif -%if 0%{?with_unit_test} +%if 0%{?with_unit_test} && 0%{?with_devel} %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 -%ifarch 0%{?gccgo_arches} -BuildRequires: gcc-go >= %{gccgo_min_vers} -%else -BuildRequires: golang -%endif +# 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 @@ -151,8 +126,10 @@ providing packages with %{import_path} prefix. # 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 unit-test.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 $file %{buildroot}/%{gopath}/src/%{import_path}/$file echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list @@ -160,12 +137,13 @@ done %endif # testing files for this project -%if 0%{?with_unit_test} +%if 0%{?with_unit_test} && 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ chmod -x %{buildroot}%{gopath}/src/%{import_path}/interop/grpc_testing/test.pb.go for ext in .pem .key .proto _test.go; do # find all files with $ext prefix and generate unit-test.file-list for file in $(find . -iname "*${ext}"); do + echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) cp $file %{buildroot}/%{gopath}/src/%{import_path}/$file echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list @@ -173,41 +151,51 @@ for ext in .pem .key .proto _test.go; do done %endif +%if 0%{?with_devel} +sort -u -o devel.file-list devel.file-list +%endif + %check %if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%ifarch 0%{?gccgo_arches} -function gotest { %{gcc_go_test} "$@"; } -%else -%if 0%{?golang_test:1} -function gotest { %{golang_test} "$@"; } +%if ! 0%{?with_bundled} +export GOPATH=%{buildroot}/%{gopath}:%{gopath} %else -function gotest { go test "$@"; } +export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif + +%if ! 0%{?gotest:1} +%global gotest go test %endif -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -gotest %{import_path} -gotest %{import_path}/benchmark -gotest %{import_path}/metadata -gotest %{import_path}/test -gotest %{import_path}/transport +%gotest %{import_path} +%gotest %{import_path}/benchmark +%gotest %{import_path}/metadata +%gotest %{import_path}/test +%gotest %{import_path}/transport %endif +#define license tag if not already defined +%{!?_licensedir:%global license %doc} + %if 0%{?with_devel} %files devel -f devel.file-list -%copying LICENSE +%license LICENSE %doc grpc-auth-support.md README.md CONTRIBUTING.md %dir %{gopath}/src/google.golang.org -%dir %{gopath}/src/%{import_path} %endif -%if 0%{?with_unit_test} +%if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test -f unit-test.file-list -%copying LICENSE +%license LICENSE %doc grpc-auth-support.md README.md CONTRIBUTING.md %endif %changelog +* Sat Sep 12 2015 jchaloup - 0-0.2.gitd286668 +- Update to spec-2.1 + resolves: #1250461 + * Tue Jul 28 2015 jchaloup - 0-0.1.gitd286668 - First package for Fedora resolves: #1246205 +