From edb897cf1d4a903904099cbfa155f73fa2d7eba3 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Oct 26 2018 06:53:35 +0000 Subject: Bump to commit ef6db91d284a0e7badaa1f0c404c30aa7dee3aed --- diff --git a/.gitignore b/.gitignore index f1d4d9a..5366628 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /goconvey-bf58a9a.tar.gz +/goconvey-ef6db91d284a0e7badaa1f0c404c30aa7dee3aed.tar.gz diff --git a/golang-github-smartystreets-goconvey.spec b/golang-github-smartystreets-goconvey.spec index 6f738fe..85f6658 100644 --- a/golang-github-smartystreets-goconvey.spec +++ b/golang-github-smartystreets-goconvey.spec @@ -1,190 +1,57 @@ -# If any of the following macros should be set otherwise, -# you can wrap any of them with the following conditions: -# - %%if 0%%{centos} == 7 -# - %%if 0%%{?rhel} == 7 -# - %%if 0%%{?fedora} == 23 -# Or just test for particular distribution: -# - %%if 0%%{centos} -# - %%if 0%%{?rhel} -# - %%if 0%%{?fedora} -# -# Be aware, on centos, both %%rhel and %%centos are set. If you want to test -# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. -# (Don't forget to replace double percentage symbol with single one in order to apply a condition) - -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 0 -# Run tests in check section -# cyclic dependency between golang-github-smartystreets-goconvey and -# golang-github-smartystreets-assertions -%global with_check 0 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%global provider github -%global provider_tld com -%global project smartystreets -%global repo goconvey # https://github.com/smartystreets/goconvey -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit bf58a9a1291224109919756b4dcc469c670cc7e4 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} -Version: 1.6.1 -Release: 0.8.git%{shortcommit}%{?dist} +%global goipath github.com/smartystreets/goconvey +%global commit ef6db91d284a0e7badaa1f0c404c30aa7dee3aed + +%gometa + +Name: %{goname} +Version: 1.6.3 +Release: 1%{?dist} Summary: Behavioral testing in the browser, integrates with go test License: MIT -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 aarch64 %{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} -# cyclic dependency between golang-github-smartystreets-goconvey and -# golang-github-smartystreets-assertions BuildRequires: golang(github.com/jtolds/gls) BuildRequires: golang(github.com/smartystreets/assertions) -%endif - -Requires: golang(github.com/jtolds/gls) -Requires: golang(github.com/smartystreets/assertions) - -Provides: golang(%{import_path}/convey) = %{version}-%{release} -Provides: golang(%{import_path}/convey/gotest) = %{version}-%{release} -Provides: golang(%{import_path}/convey/reporting) = %{version}-%{release} -Provides: golang(%{import_path}/web/server/api) = %{version}-%{release} -Provides: golang(%{import_path}/web/server/contract) = %{version}-%{release} -Provides: golang(%{import_path}/web/server/executor) = %{version}-%{release} -Provides: golang(%{import_path}/web/server/messaging) = %{version}-%{release} -Provides: golang(%{import_path}/web/server/parser) = %{version}-%{release} -Provides: golang(%{import_path}/web/server/system) = %{version}-%{release} -Provides: golang(%{import_path}/web/server/watch) = %{version}-%{release} -Provides: golang(%{import_path}/web/server/watch/integration_testing/sub) = %{version}-%{release} %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} -%package unit-test -Summary: Unit tests for %{name} package - -%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} +%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 - 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}/ -# 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 ! 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}/convey -%gotest %{import_path}/convey/reporting -%gotest %{import_path}/web/server/api -%gotest %{import_path}/web/server/executor -%gotest %{import_path}/web/server/parser -%gotest %{import_path}/web/server/system -%gotest %{import_path}/web/server/watch -%gotest %{import_path}/web/server/watch/integration_testing/sub -%endif - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%if 0%{?with_devel} +%gochecks + + %files devel -f devel.file-list %license LICENSE.md %doc README.md CONTRIBUTING.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif -%if 0%{?with_unit_test} -%files unit-test -f unit-test.file-list -%license LICENSE.md -%doc README.md CONTRIBUTING.md -%endif %changelog +* Sat Oct 06 2018 Robert-André Mauchin - 1.6.3-1.20181006gitef6db91 +- Bump to commit ef6db91d284a0e7badaa1f0c404c30aa7dee3aed + * Fri Jul 13 2018 Fedora Release Engineering - 1.6.1-0.8.gitbf58a9a - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild @@ -229,4 +96,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} * Thu Apr 16 2015 jchaloup - 0-0.1.git43652d6 - First package for Fedora resolves: #1214862 - diff --git a/sources b/sources index 6ea985a..7cbc47a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c3f06e0d9f6a587e63778ed8c125b57 goconvey-bf58a9a.tar.gz +SHA512 (goconvey-ef6db91d284a0e7badaa1f0c404c30aa7dee3aed.tar.gz) = 07d884f19149408596dc91b7b10c72176abfa22c052554a4d23629d1d7011e1dd6b251c7288973b71f3ef3ee1b85a299a79cd8efb4ba2e1feb660f2244efb82b