From 971f5f34bd5467cbaf63030075b7810591891fff Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sep 30 2018 16:41:31 +0000 Subject: update to version 4.0.0 --- diff --git a/.gitignore b/.gitignore index 532f1b8..aafe01f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ +/results* +/*.src.rpm /chmduquesne-rollinghash-043b8fd.tar.gz /chmduquesne-rollinghash-e6b39c4.tar.gz /chmduquesne-rollinghash-3.0.0.tar.gz /chmduquesne-rollinghash-3.0.1.tar.gz +/rollinghash-v3.0.1.tar.gz +/rollinghash-v4.0.0.tar.gz diff --git a/golang-github-chmduquesne-rollinghash.spec b/golang-github-chmduquesne-rollinghash.spec index cb436d2..b23c724 100644 --- a/golang-github-chmduquesne-rollinghash.spec +++ b/golang-github-chmduquesne-rollinghash.spec @@ -1,181 +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 chmduquesne -%global repo rollinghash -# https://github.com/chmduquesne/rollinghash -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit abb8cbaf9915e48ee20cae94bcd94221b61707a2 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20171128 - -# commit abb8cbaf9915e48ee20cae94bcd94221b61707a2 == version 3.0.1 - - -Name: golang-%{provider}-%{project}-%{repo} -Version: 3.0.1 -Release: 2%{?dist} +Name: golang-github-chmduquesne-rollinghash Summary: Some rolling checksum implementations in go +Version: 4.0.0 +Release: 1%{?dist} License: MIT and BSD -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/v%{version}/%{project}-%{repo}-%{version}.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} +# https://github.com/chmduquesne/rollinghash +%global goipath github.com/chmduquesne/rollinghash +%global tag v4.0.0 + +%gometa +URL: %{gourl} +Source0: %{gosource} %description %{summary} -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/adler32) = %{version}-%{release} -Provides: golang(%{import_path}/bozo32) = %{version}-%{release} -Provides: golang(%{import_path}/buzhash32) = %{version}-%{release} -Provides: golang(%{import_path}/buzhash64) = %{version}-%{release} -Provides: golang(%{import_path}/rabinkarp64) = %{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}-%{version} - +%gosetup -q -%build +# remove test program; it pulls in extra dependencies +rm -r ./roll %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} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# No dependency directories so far - -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path} -%gotest %{import_path}/adler32 -%gotest %{import_path}/bozo32 -%gotest %{import_path}/buzhash32 -%gotest %{import_path}/buzhash64 -%gotest %{import_path}/rabinkarp64 -%endif - +%gochecks -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE.txt %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.txt -%doc README.md -%endif %changelog +* Thu Sep 13 2018 Fabio Valentini - 4.0.0-1 +- Update to version 4.0.0. +- Remove test program, it pulls in extra dependencies. +- Update to spec 3.0. + * Wed Feb 07 2018 Fedora Release Engineering - 3.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 78bfc9f..f985199 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chmduquesne-rollinghash-3.0.1.tar.gz) = c5520d33d836ceeb1f0dee343d52bd292ece3b34beebf7e12cf1e373f4fc9b14bf0b01e9ba62324d65766b1354ca36738ee68921317d03c8e9faa51df9ee25e8 +SHA512 (rollinghash-v4.0.0.tar.gz) = 2b8828309a0cdf727db95d3956df1031eca08a6f614af771e808a01cfc711e7f7303f0803e08b7c924342a093aaaa51af9aa3f0816c748c7ff3227047e204471