From 33b19bb8badba00502201a06c0e76faf860a857f Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sep 02 2018 17:00:45 +0000 Subject: update to spec 3.0 --- diff --git a/.gitignore b/.gitignore index 648241a..1924265 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /petermattis-goid-3db12eb.tar.gz /petermattis-goid-176e84a.tar.gz /petermattis-goid-b0b1615.tar.gz +/goid-b0b1615b78e5ee59739545bb38426383b2cda4c9.tar.gz diff --git a/golang-github-petermattis-goid.spec b/golang-github-petermattis-goid.spec index 298a4dc..d185143 100644 --- a/golang-github-petermattis-goid.spec +++ b/golang-github-petermattis-goid.spec @@ -1,162 +1,56 @@ -# 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 -%global with_check 1 -# 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 petermattis -%global repo goid # https://github.com/petermattis/goid -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit b0b1615b78e5ee59739545bb38426383b2cda4c9 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20180202 +%global goipath github.com/petermattis/goid +%global commit b0b1615b78e5ee59739545bb38426383b2cda4c9 +%global date 20180202 +%gometa -Name: golang-%{provider}-%{project}-%{repo} +Name: %{goname} Version: 0 -Release: 0.9.%{commitdate}.git%{shortcommit}%{?dist} +Release: 0.10%{?dist} Summary: Programmatic retrieval of goroutine IDs License: ASL 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{project}-%{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 -Provides: golang(%{import_path}) = %{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} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +%{goipath} prefix. %prep -%setup -q -n %{repo}-%{commit} - - -%build +%gosetup -q %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" -or -iname "*.s" \) \! -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ - -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -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} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} +%gochecks -%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/%{provider}.%{provider_tld}/%{project} -%endif - - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md -%endif %changelog +* Sun Sep 02 2018 Fabio Valentini - 0-0.10.20180202gitb0b1615 +- Update to use spec 3.0. + * Fri Jul 13 2018 Fedora Release Engineering - 0-0.9.20180202.gitb0b1615 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index e4bc074..b7ac570 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (petermattis-goid-b0b1615.tar.gz) = 52068f22edbc627623002a09979c0762aaf6d96c2a0cb248d47945a364e117df40a35d9937e3e98b8d47f109df5edcac470f963eec0117bc1c515419d72e393d +SHA512 (goid-b0b1615b78e5ee59739545bb38426383b2cda4c9.tar.gz) = 52068f22edbc627623002a09979c0762aaf6d96c2a0cb248d47945a364e117df40a35d9937e3e98b8d47f109df5edcac470f963eec0117bc1c515419d72e393d