From 181caad73a8712ddba70ca6dd90b717fbbed1f13 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jun 28 2018 10:42:01 +0000 Subject: Upload glide files --- diff --git a/.gitignore b/.gitignore index c60bd5b..d44bbb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/columnize-983d3a5.tar.gz +/columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz diff --git a/glide.lock b/glide.lock new file mode 100644 index 0000000..e3e7a99 --- /dev/null +++ b/glide.lock @@ -0,0 +1,4 @@ +hash: 5d37c443a8d5ee51eb6dde3335dcc5e2fb451b629f06ea8af551214a2925c538 +imports: [] +updated: '2018-06-28T10:41:27.776461+00:00' + diff --git a/glide.yaml b/glide.yaml new file mode 100644 index 0000000..5150041 --- /dev/null +++ b/glide.yaml @@ -0,0 +1,3 @@ +import: [] +package: github.com/ryanuber/columnize + diff --git a/golang-github-ryanuber-columnize.spec b/golang-github-ryanuber-columnize.spec index 968d728..8594757 100644 --- a/golang-github-ryanuber-columnize.spec +++ b/golang-github-ryanuber-columnize.spec @@ -1,172 +1,53 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 -%global with_devel 1 -%global with_bundled 0 -%global with_debug 0 -%global with_check 1 -%global with_unit_test 1 -%else -%global with_devel 0 -%global with_bundled 0 -%global with_debug 0 -%global with_check 0 -%global with_unit_test 0 -%endif - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%define copying() \ -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \ -%license %{*} \ -%else \ -%doc %{*} \ -%endif - -%global provider github -%global provider_tld com -%global project ryanuber -%global repo columnize -# https://github.com/ryanuber/columnize -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} +# http://github.com/ryanuber/columnize + +%global goipath github.com/ryanuber/columnize %global commit 983d3a5fab1bf04d1b412465d2d9f8430e2e917e -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -Name: golang-%{provider}-%{project}-%{repo} + +%gometa -i + +Name: %{goname} Version: 0 -Release: 0.9.git%{shortcommit}%{?dist} +Release: 0.10%{?dist} Summary: Easy column formatted output for golang License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# If go_arches not defined fall through to implicit golang archs -%if 0%{?go_arches:1} -ExclusiveArch: %{go_arches} -%else -ExclusiveArch: %{ix86} x86_64 %{arm} -%endif -# If gccgo_arches does not fit or is not defined fall through to golang -%ifarch 0%{?gccgo_arches} -BuildRequires: gcc-go >= %{gccgo_min_vers} -%else -BuildRequires: golang -%endif +URL: %{gourl} +Source0: %{gosource} +Source1: glide.yaml +Source2: glide.yaml + %description %{summary} -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} -%endif - -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} -%package unit-test -Summary: Unit tests for %{name} package -# If go_arches not defined fall through to implicit golang archs -%if 0%{?go_arches:1} -ExclusiveArch: %{go_arches} -%else -ExclusiveArch: %{ix86} x86_64 %{arm} -%endif -# If gccgo_arches does not fit or is not defined fall through to golang -%ifarch 0%{?gccgo_arches} -BuildRequires: gcc-go >= %{gccgo_min_vers} -%else -BuildRequires: golang -%endif - -%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 +%{goipath} prefix. %prep -%setup -q -n %{repo}-%{commit} - -%build - +%gosetup -q +cp %{SOURCE1} %{SOURCE2} . %install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do - 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 - 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 +%goinstall glide.lock glide.yaml %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%ifarch 0%{?gccgo_arches} -function gotest { %{gcc_go_test} "$@"; } -%else -%if 0%{?golang_test:1} -function gotest { %{golang_test} "$@"; } -%else -function gotest { go test "$@"; } -%endif -%endif - -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -gotest %{import_path} -%endif - -%if 0%{?with_devel} -%files devel -f devel.file-list -%copying COPYING -%doc README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%dir %{gopath}/src/%{import_path} -%endif +%gochecks -%if 0%{?with_unit_test} -%files unit-test -f unit-test.file-list -%copying COPYING +%files devel -f devel.file-list +%license COPYING %doc README.md -%endif %changelog +* Thu Jun 28 2018 Jan Chaloupka - 0-0.10.git983d3a5 +- Upload glide files + * Wed Feb 07 2018 Fedora Release Engineering - 0-0.9.git983d3a5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 220476b..1ff81ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea013157ff5b77c298820daf20c628b3 columnize-983d3a5.tar.gz +SHA512 (columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz) = 0c746f39fe3f5b9ab0c62c188fe92183c23908fce2952d4ada366cedf204dc58883d717666d71fc1b37f5ed00411da39cfbd4d37ce5cf10012cdecc5704149b1