diff --git a/.gitignore b/.gitignore index 6d29360..769c186 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /klauspost-reedsolomon-6bb6130.tar.gz /klauspost-reedsolomon-e52c150.tar.gz /klauspost-reedsolomon-0b30fa7.tar.gz +/reedsolomon-925cb01d65108f2c935e02fdb79ff4a055a4a20d.tar.gz diff --git a/golang-github-klauspost-reedsolomon.spec b/golang-github-klauspost-reedsolomon.spec index 8256d89..4db080f 100644 --- a/golang-github-klauspost-reedsolomon.spec +++ b/golang-github-klauspost-reedsolomon.spec @@ -1,171 +1,60 @@ -# 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 klauspost -%global repo reedsolomon # https://github.com/klauspost/reedsolomon -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 0b30fa71cc8e4e9010c9aba6d0320e2e5b163b29 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20171219 +%global goipath github.com/klauspost/reedsolomon +%global commit 925cb01d65108f2c935e02fdb79ff4a055a4a20d +%global date 20180704 +%gometa -Name: golang-%{provider}-%{project}-%{repo} +Name: %{goname} Version: 1.6 -Release: 5.%{commitdate}.git%{shortcommit}%{?dist} +Release: 6%{?dist} Summary: Reed-Solomon Erasure Coding in Go License: MIT -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 -%if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/klauspost/cpuid) -%endif - -Requires: golang(github.com/klauspost/cpuid) - -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 -# remove source code examples -rm -r ./examples - -# 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} - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path} -%endif - - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} +%gochecks -%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 - 1.6-6.20180704git925cb01 +- Bump to commit 925cb01. +- Update to use spec 3.0. + * Fri Jul 13 2018 Fedora Release Engineering - 1.6-5.20171219.git0b30fa7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 780151a..8e90e21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (klauspost-reedsolomon-0b30fa7.tar.gz) = f83d842018e1fb85109c01bb383c4564423ffbbb6c88c144445faa63766a506e0930248750349f4d3e60b42c0a88eb48b7f09de5d6a130245fe2bd9b5777dda7 +SHA512 (reedsolomon-925cb01d65108f2c935e02fdb79ff4a055a4a20d.tar.gz) = 2f7bf5181fcb3b04ca20baf8ba1f72c41ec63de3262a8835cc44e92e9e44ff221de5194afa63dc250e396cefe617b0d6417a4a095325c0336a525dc17655dc3e