From 9d1293d44b32e81f4f91abc4d35304288b47bd68 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Nov 23 2018 16:43:24 +0000 Subject: rebuilt for upstream 0.11.0 update to new Go packaging Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index 3a47e46..81f68e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /tar-split-d50e5c9.tar.gz /tar-split-24fe0a9.tar.gz +/tar-split-0.11.0.tar.gz diff --git a/golang-github-vbatts-tar-split.spec b/golang-github-vbatts-tar-split.spec index eab9a58..af6af60 100644 --- a/golang-github-vbatts-tar-split.spec +++ b/golang-github-vbatts-tar-split.spec @@ -1,179 +1,80 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 -%global with_devel 1 -%global with_bundled 0 -%global with_debug 1 -%global with_check 1 -%global with_unit_test 1 -%else -%global with_devel 1 -%global with_bundled 0 -%global with_debug 1 -%global with_check 0 -%global with_unit_test 1 -%endif - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif +# Run tests in check section +%bcond_without check -%global provider github -%global provider_tld com -%global project vbatts -%global repo tar-split # https://github.com/vbatts/tar-split -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 24fe0a94fe8e2f2c42cb1d49277379e8f2dbb06e -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} -Version: 0.9.13 -Release: 8%{?dist} +%global goipath github.com/vbatts/tar-split +Version: 0.11.0 + +%global common_description %{expand: +Pristinely disassembling a tar archive, and stashing needed raw bytes and +offsets to reassemble a validating original archive.} + +%gometa + +Name: %{goname} +Release: 1%{?dist} Summary: Tar archive assembly/dis-assembly +# Detected licences +# - BSD 3-clause "New" or "Revised" License at 'LICENSE' License: BSD -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 %{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/Sirupsen/logrus) +BuildRequires: golang(github.com/urfave/cli) %description -Pristinely disassembling a tar archive, and stashing needed raw bytes and -offsets to reassemble a validating original archive. +%{common_description} + -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif - -%if ! 0%{?with_bundled} -BuildRequires: golang(github.com/Sirupsen/logrus) -BuildRequires: golang(github.com/codegangsta/cli) -%endif - -Provides: golang(%{import_path}/archive/tar) = %{version}-%{release} -Provides: golang(%{import_path}/tar/asm) = %{version}-%{release} -Provides: golang(%{import_path}/tar/storage) = %{version}-%{release} -Provides: golang(%{import_path}/version) = %{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} && 0%{?with_devel} -%package unit-test-devel -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-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif %prep -%setup -q -n %{repo}-%{commit} +%forgeautosetup + %build -mkdir -p src/github.com/vbatts -ln -s ../../../ src/github.com/vbatts/tar-split - -%if ! 0%{?with_bundled} -export GOPATH=$(pwd):%{gopath} -%else -echo "Unable to build from bundled deps. No Godeps nor vendor directory" -exit 1 -%endif +%gobuildroot +%gobuild -o _bin/tar-split %{goipath}/cmd/tar-split -%gobuild -o bin/tar-split %{import_path}/cmd/tar-split %install -# install tar-split binary -install -d %{buildroot}%{_bindir} -install -p -m 755 bin/%{repo} %{buildroot}%{_bindir} - -# 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" \! -iname "testdata") ; 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} && 0%{?with_devel} -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" -o -iname "testdata"); 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-devel.file-list -done -%endif +%goinstall +install -Dpm 0755 _bin/tar-split %{buildroot}%{_bindir}/tar-split -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%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} -%endif - -%gotest %{import_path}/archive/tar -%gotest %{import_path}/tar/asm -%gotest %{import_path}/tar/storage +%gochecks %endif -#define license tag if not already defined -%{!?_licensedir:%global license %doc} %files %license LICENSE %doc README.md -%{_bindir}/%{repo} +%{_bindir}/tar-split + -%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 +* Fri Nov 23 2018 Steve Baker - 0.11.0-1 +- rebuilt for upstream 0.11.0 +- update to new Go packaging + * Fri Jul 13 2018 Fedora Release Engineering - 0.9.13-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 68fde31..256df63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5cc4e5ed311fa96bf83ba7a8a6126011 tar-split-24fe0a9.tar.gz +SHA512 (tar-split-0.11.0.tar.gz) = ca965eea25e89cb0b01bd8f3f8ff42f8e9b2c251cf5ecf7f8ab4cd3b9d77673f9308a2f31251995e857ef561152c36a40c7da597a857eabc2c8733aa1ae42797