From cc87ec19da780e6c9fd559d032b4c585a68a5317 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Aug 20 2015 09:51:15 +0000 Subject: Update spec file to spec-2.0 - related: #1214619 --- diff --git a/golang-github-onsi-ginkgo.spec b/golang-github-onsi-ginkgo.spec index 6a3d878..ea0888f 100644 --- a/golang-github-onsi-ginkgo.spec +++ b/golang-github-onsi-ginkgo.spec @@ -1,62 +1,133 @@ -%global provider github -%global provider_tld com -%global project onsi -%global repo ginkgo -%global commit 462326b1628e124b23f42e87a8f2750e3c4e2d24 +%if 0%{?fedora} || 0%{?rhel} == 6 +%global with_devel 1 +%global with_bundled 0 +%global with_debug 0 +# Cyclic dependency on gomega +%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 + +%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 provider github +%global provider_tld com +%global project onsi +%global repo ginkgo # https://github.com/onsi/ginkgo -%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global debug_package %{nil} - -Name: golang-%{provider}-%{project}-%{repo} -Version: 1.1.0 -Release: 3%{?dist} -Summary: A Golang BDD Testing Framework -License: MIT -URL: http://%{import_path} -Source0: https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -BuildArch: noarch +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} +%global commit 462326b1628e124b23f42e87a8f2750e3c4e2d24 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: golang-%{provider}-%{project}-%{repo} +Version: 1.1.0 +Release: 4%{?dist} +Summary: A Golang BDD Testing Framework +License: MIT +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} +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 %description -%{summary}. +%{summary} +%if 0%{?with_devel} %package devel -BuildRequires: golang >= 1.2.1-3 -BuildRequires: golang(github.com/onsi/gomega) -Requires: golang >= 1.2.1-3 -Requires: golang(github.com/onsi/gomega) -Summary: %{summary} -Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/config) = %{version}-%{release} -Provides: golang(%{import_path}/ginkgo/convert) = %{version}-%{release} -Provides: golang(%{import_path}/ginkgo/interrupthandler) = %{version}-%{release} -Provides: golang(%{import_path}/ginkgo/nodot) = %{version}-%{release} -Provides: golang(%{import_path}/ginkgo/testrunner) = %{version}-%{release} -Provides: golang(%{import_path}/ginkgo/testsuite) = %{version}-%{release} -Provides: golang(%{import_path}/ginkgo/watch) = %{version}-%{release} -Provides: golang(%{import_path}/internal/codelocation) = %{version}-%{release} -Provides: golang(%{import_path}/internal/containernode) = %{version}-%{release} -Provides: golang(%{import_path}/internal/failer) = %{version}-%{release} -Provides: golang(%{import_path}/internal/leafnodes) = %{version}-%{release} -Provides: golang(%{import_path}/internal/remote) = %{version}-%{release} -Provides: golang(%{import_path}/internal/spec) = %{version}-%{release} -Provides: golang(%{import_path}/internal/specrunner) = %{version}-%{release} -Provides: golang(%{import_path}/internal/suite) = %{version}-%{release} -Provides: golang(%{import_path}/internal/testingtproxy) = %{version}-%{release} -Provides: golang(%{import_path}/internal/writer) = %{version}-%{release} -Provides: golang(%{import_path}/reporters) = %{version}-%{release} -Provides: golang(%{import_path}/reporters/stenographer) = %{version}-%{release} -Provides: golang(%{import_path}/types) = %{version}-%{release} +Summary: %{summary} +BuildArch: noarch + +%if 0%{?with_check} +BuildRequires: golang(github.com/onsi/gomega) +BuildRequires: golang(github.com/onsi/gomega/gbytes) +BuildRequires: golang(github.com/onsi/gomega/gexec) +BuildRequires: golang(github.com/onsi/gomega/ghttp) +%endif + +Requires: golang(github.com/onsi/gomega) +Requires: golang(github.com/onsi/gomega/gbytes) +Requires: golang(github.com/onsi/gomega/gexec) +Requires: golang(github.com/onsi/gomega/ghttp) + +Provides: golang(%{import_path}) = %{version}-%{release} +Provides: golang(%{import_path}/config) = %{version}-%{release} +Provides: golang(%{import_path}/ginkgo/convert) = %{version}-%{release} +Provides: golang(%{import_path}/ginkgo/interrupthandler) = %{version}-%{release} +Provides: golang(%{import_path}/ginkgo/nodot) = %{version}-%{release} +Provides: golang(%{import_path}/ginkgo/testrunner) = %{version}-%{release} +Provides: golang(%{import_path}/ginkgo/testsuite) = %{version}-%{release} +Provides: golang(%{import_path}/ginkgo/watch) = %{version}-%{release} +Provides: golang(%{import_path}/integration) = %{version}-%{release} +Provides: golang(%{import_path}/reporters) = %{version}-%{release} +Provides: golang(%{import_path}/reporters/stenographer) = %{version}-%{release} +Provides: golang(%{import_path}/types) = %{version}-%{release} %description devel -%{summary}. +%{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} +%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 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} -This package contains library source intended for -building other packages which use p/%{repo}. +%description unit-test +%{summary} + +This package contains unit tests for project +providing packages with %{import_path} prefix. +%endif %prep %setup -q -n %{repo}-%{commit} @@ -64,19 +135,76 @@ building other packages which use p/%{repo}. %build %install +# source codes for building projects +%if 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +# 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 + +# testing files for this project +%if 0%{?with_unit_test} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/ -cp -pav {config,ginkgo,integration,internal,reporters,types} %{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 -#go test can not be done as there is a circular dependency between golang-github-onsi-ginkgo and golang-github-onsi-gomega package +%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} "$@"; } +%else +function gotest { go test "$@"; } +%endif +%endif -%files devel -%doc README.md LICENSE CHANGELOG.md +export GOPATH=%{buildroot}/%{gopath}:%{gopath} +gotest %{import_path}/ginkgo/nodot +gotest %{import_path}/ginkgo/testsuite +gotest %{import_path}/integration +gotest %{import_path}/internal/codelocation +gotest %{import_path}/internal/containernode +gotest %{import_path}/internal/failer +gotest %{import_path}/internal/leafnodes +gotest %{import_path}/internal/remote +gotest %{import_path}/internal/spec +gotest %{import_path}/internal/specrunner +gotest %{import_path}/internal/suite +gotest %{import_path}/internal/writer +gotest %{import_path}/reporters +gotest %{import_path}/types +%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 +* Thu Aug 20 2015 jchaloup - 1.1.0-4 +- Update spec file to spec-2.0 + related: #1214619 + * Wed Jun 17 2015 Fedora Release Engineering - 1.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -102,7 +230,3 @@ cp -pav {config,ginkgo,integration,internal,reporters,types} %{buildroot}/%{gopa * Wed Oct 01 2014 Jan Chaloupka - 0-0.1.git90d6a47 - First package for Fedora - - - -