From 81bfe7a02f7e4d28125b8a979beb0fbcefcec1e2 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Mar 03 2019 15:27:06 +0000 Subject: Bump to commit 788fd78401277ebd861206a03c884797c6ec5541 Update to new Go packging Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index a24c134..24f50f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /check-10bfe05.tar.gz /check-91ae5f8.tar.gz /check-4f90aea.tar.gz +/check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz diff --git a/golang-gopkg-check.spec b/golang-gopkg-check.spec index c495c55..61dfaf1 100644 --- a/golang-gopkg-check.spec +++ b/golang-gopkg-check.spec @@ -1,194 +1,68 @@ -# 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 -# Failing on aarch and arm -%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 +%bcond_without check -%global provider github -%global provider_tld com -%global project go-check -%global repo check # https://github.com/go-check/check -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path gopkg.in/check.v1 -%global import_path_sec launchpad.net/gocheck -%global commit 4f90aeace3a26ad7021961c297b22c42160c7b25 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global gimport_path github.com/go-check/check - -# github.com/motain/gocheck, cloned from github.com/go-check/check on Oct 23, 2013 -%global mcommit 10bfe0586b48cbca10fe6c43d6e18136f25f8c0c -%global mscommit %(c=%{mcommit}; echo ${c:0:7}) -%global mimport_path github.com/motain/gocheck - -Name: golang-gopkg-%{repo} +%global goipath gopkg.in/check.v1 +%global forgeurl https://github.com/go-check/check +%global commit 788fd78401277ebd861206a03c884797c6ec5541 + +%global common_description %{expand: +Rich testing for the Go language.} + +%gometa + +Name: golang-gopkg-check Version: 1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Rich testing for the Go language +# Detected licences +# - BSD 2-clause "Simplified" License at 'LICENSE' License: BSD -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{mcommit}/%{repo}-%{mscommit}.tar.gz -Source1: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -Obsoletes: golang-launchpad-gocheck +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 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} +BuildRequires: golang(github.com/kr/pretty) %description -%{summary} +%{common_description} + -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} -%endif - -Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path_sec}) = %{version}-%{release} -Provides: golang(%{mimport_path}) = %{version}-%{release} -Provides: golang(%{gimport_path}) = %{version}-%{release} -Obsoletes: golang-launchpad-gocheck-devel - %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} -%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} +%{goipath} prefix. -%description unit-test -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif %prep -%setup -n %{repo}-%{mcommit} -q -%setup -n %{repo}-%{commit} -q -T -b 1 +%forgeautosetup -%build %install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/ -install -d -p %{buildroot}/%{gopath}/src/%{gimport_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 $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/$(dirname $file) - cp $file %{buildroot}/%{gopath}/src/%{import_path_sec}/$file - echo "%%{gopath}/src/%%{import_path_sec}/$file" >> devel.file-list - - install -d -p %{buildroot}/%{gopath}/src/%{gimport_path}/$(dirname $file) - cp $file %{buildroot}/%{gopath}/src/%{gimport_path}/$file - echo "%%{gopath}/src/%%{gimport_path}/$file" >> devel.file-list -done -%endif +%goinstall -pushd ../%{repo}-%{mcommit} -install -d -p %{buildroot}/%{gopath}/src/%{mimport_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/%{mimport_path}/$(dirname $file) - cp $file %{buildroot}/%{gopath}/src/%{mimport_path}/$file - echo "%%{gopath}/src/%%{mimport_path}/$file" >> ../%{repo}-%{commit}/devel.file-list -done -popd - -# 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 - 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 -done -%endif +%if %{with check} %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} +%gochecks %endif -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path} -%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/%{import_path} -%dir %{gopath}/src/%{import_path_sec} -%dir %{gopath}/src/%{gimport_path} -%endif -%if 0%{?with_unit_test} -%files unit-test -f unit-test.file-list -%license LICENSE -%doc README.md -%endif %changelog +* Sun Mar 03 2019 Robert-André Mauchin - 1-20.20190303git788fd78 +- Bump to commit 788fd78401277ebd861206a03c884797c6ec5541 +- Update to new Go packging + * Fri Feb 01 2019 Fedora Release Engineering - 1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 221757a..56ad361 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -57cfe3f08dc8817f4f883e4c5153380f check-4f90aea.tar.gz -d264f8337bb29da228b024a217704820 check-10bfe05.tar.gz +SHA512 (check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz) = 3b0a79ee3dd9e4c321a549ff8b08788ea1bfad34c29cdf42976e955716f2139b3ba7c40e8bf36d8dac01711d590fb2ab26767a06222fe4645856a401219a481b