From 2187dfbf0fcdf6ba20874900b2c2b11a10474218 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Oct 06 2018 21:46:22 +0000 Subject: Bump to commit b2de0cb4f26d0705483a2f495d89896d0b808573 Update with new Go packaging --- diff --git a/.gitignore b/.gitignore index 6a04ec6..d4533f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /assertions-287b434.tar.gz +/assertions-1.8.3.tar.gz +/assertions-b2de0cb4f26d0705483a2f495d89896d0b808573.tar.gz diff --git a/golang-github-smartystreets-assertions.spec b/golang-github-smartystreets-assertions.spec index 7f0680d..dcafebd 100644 --- a/golang-github-smartystreets-assertions.spec +++ b/golang-github-smartystreets-assertions.spec @@ -1,171 +1,63 @@ -# 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 test -%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 assertions # https://github.com/smartystreets/assertions -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 287b4346dc4e71a038c346375a9d572453bc469b -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} -Version: 1.6.0 -Release: 0.8.git%{shortcommit}%{?dist} +%global goipath github.com/smartystreets/assertions +%global commit b2de0cb4f26d0705483a2f495d89896d0b808573 + +%global common_description %{expand: +Package assertions contains the implementations for all assertions which are +referenced in goconvey's convey package +(github.com/smartystreets/goconvey/convey) and gunit +(github.com/smartystreets/gunit) for use with the So(...) method. They can +also be used in traditional Go test functions and even in applications.} + +%gometa + +Name: %{goname} +Version: 1.8.3 +Release: 1%{?dist} Summary: Fluent assertion-style functions License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +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} %description -%{summary} +%{common_description} + -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} -BuildRequires: golang(golang.org/x/net/context) -%endif - -Requires: golang(golang.org/x/net/context) - -Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/should) = %{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} -%package unit-test -Summary: Unit tests for %{name} package +%{goipath} prefix. -%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} - -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} -# unitptr overflow on i386 -#%%gotest %{import_path}/internal/oglematchers -%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 -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif +%doc README.md CONTRIBUTING.md -%if 0%{?with_unit_test} -%files unit-test -f unit-test.file-list -%license LICENSE.md -%doc README.md -%endif %changelog +* Sat Oct 06 2018 Robert-André Mauchin - 1.8.3-1.20181006gitb2de0cb +- Bump to commit b2de0cb4f26d0705483a2f495d89896d0b808573 +- Update with new Go packaging + * Fri Jul 13 2018 Fedora Release Engineering - 1.6.0-0.8.git287b434 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 634af61..5375d17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1979d8de146dda01b2b8994e345671cf assertions-287b434.tar.gz +SHA512 (assertions-b2de0cb4f26d0705483a2f495d89896d0b808573.tar.gz) = 4e942f5f4f1708dd17ed48f046b34366e912337823a6df062e80ce30272d83c6935ede281bb984b51f905de764821d03d61972ec7cfcdac38ddc2d4e90e29b3a