From 72374240d553e866a80e98e283b5ca791bdf7229 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jan 25 2017 09:57:43 +0000 Subject: Bump to upstream 16990631d4aa7e38f73dbbbf37fa13e67c648531 - resolves: #1414254 --- diff --git a/.gitignore b/.gitignore index 71b1bc4..88cc6a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/viper-be5ff3e.tar.gz +/viper-1699063.tar.gz diff --git a/change-import-path.patch b/change-import-path.patch index c1fdf5a..a7787a7 100644 --- a/change-import-path.patch +++ b/change-import-path.patch @@ -1,7 +1,7 @@ -From 946c1e2ba578c48091c2257873d0b17c5ffd8d34 Mon Sep 17 00:00:00 2001 +From 53b0f0aecd79028dacf1cffbf3ef87bffc14dd05 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Fri, 9 Oct 2015 00:56:51 +0200 -Subject: [PATCH] change import path +Date: Wed, 25 Jan 2017 10:32:31 +0100 +Subject: [PATCH] change import paths --- util.go | 2 +- @@ -9,12 +9,12 @@ Subject: [PATCH] change import path 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/util.go b/util.go -index 7904b1a..79b8c02 100644 +index fe6cb45..94c4398 100644 --- a/util.go +++ b/util.go -@@ -24,7 +24,7 @@ import ( - "github.com/BurntSushi/toml" +@@ -25,7 +25,7 @@ import ( "github.com/magiconair/properties" + toml "github.com/pelletier/go-toml" "github.com/spf13/cast" - jww "github.com/spf13/jwalterweatherman" + jww "github.com/spf13/jWalterWeatherman" @@ -22,12 +22,12 @@ index 7904b1a..79b8c02 100644 ) diff --git a/viper.go b/viper.go -index 799983f..fd49119 100644 +index f17790e..6ae3640 100644 --- a/viper.go +++ b/viper.go -@@ -33,7 +33,7 @@ import ( - "github.com/kr/pretty" +@@ -34,7 +34,7 @@ import ( "github.com/mitchellh/mapstructure" + "github.com/spf13/afero" "github.com/spf13/cast" - jww "github.com/spf13/jwalterweatherman" + jww "github.com/spf13/jWalterWeatherman" @@ -35,5 +35,5 @@ index 799983f..fd49119 100644 ) -- -1.9.3 +2.7.4 diff --git a/golang-github-spf13-viper.spec b/golang-github-spf13-viper.spec index 3d8061a..70d835e 100644 --- a/golang-github-spf13-viper.spec +++ b/golang-github-spf13-viper.spec @@ -1,16 +1,28 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 +# If any of the following macros should be set otherwise, +# you can wrap any of them with the following conditions: +# - %%if 0%%{centos} == 7 +# - %%if 0%%{?rhel} == 7 +# - %%if 0%%{?fedora} == 23 +# Or just test for particular distribution: +# - %%if 0%%{centos} +# - %%if 0%%{?rhel} +# - %%if 0%%{?fedora} +# +# Be aware, on centos, both %%rhel and %%centos are set. If you want to test +# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. +# (Don't forget to replace double percentage symbol with single one in order to apply a condition) + +# 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 -%global with_check 1 -%global with_unit_test 1 -%else -%global with_devel 0 -%global with_bundled 0 -%global with_debug 0 +# Run tests in check section +# constant 765432101234567 overflows int %global with_check 0 -%global with_unit_test 0 -%endif +# Generate unit-test rpm +%global with_unit_test 1 %if 0%{?with_debug} %global _dwz_low_mem_die_limit 0 @@ -25,12 +37,12 @@ # https://github.com/spf13/viper %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit be5ff3e4840cf692388bde7a057595a474ef379e +%global commit 16990631d4aa7e38f73dbbbf37fa13e67c648531 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: golang-%{provider}-%{project}-%{repo} Version: 0 -Release: 0.4.git%{shortcommit}%{?dist} +Release: 0.5.git%{shortcommit}%{?dist} Summary: Go configuration with fangs License: MIT URL: https://%{provider_prefix} @@ -39,7 +51,7 @@ Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcomm Patch0: change-import-path.patch # 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}} +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} @@ -52,26 +64,30 @@ Summary: %{summary} BuildArch: noarch %if 0%{?with_check} -BuildRequires: golang(github.com/BurntSushi/toml) -BuildRequires: golang(github.com/kr/pretty) +BuildRequires: golang(github.com/fsnotify/fsnotify) +BuildRequires: golang(github.com/hashicorp/hcl) BuildRequires: golang(github.com/magiconair/properties) BuildRequires: golang(github.com/mitchellh/mapstructure) +BuildRequires: golang(github.com/pelletier/go-toml) +BuildRequires: golang(github.com/spf13/afero) BuildRequires: golang(github.com/spf13/cast) BuildRequires: golang(github.com/spf13/jWalterWeatherman) BuildRequires: golang(github.com/spf13/pflag) -BuildRequires: golang(github.com/stretchr/testify/assert) +#BuildRequires: golang(github.com/xordataexchange/crypt/config) BuildRequires: golang(gopkg.in/yaml.v2) %endif -Requires: golang(github.com/BurntSushi/toml) -Requires: golang(github.com/kr/pretty) -Requires: golang(github.com/magiconair/properties) -Requires: golang(github.com/mitchellh/mapstructure) -Requires: golang(github.com/spf13/cast) -Requires: golang(github.com/spf13/jWalterWeatherman) -Requires: golang(github.com/spf13/pflag) -Requires: golang(github.com/stretchr/testify/assert) -Requires: golang(gopkg.in/yaml.v2) +Requires: golang(github.com/fsnotify/fsnotify) +Requires: golang(github.com/hashicorp/hcl) +Requires: golang(github.com/magiconair/properties) +Requires: golang(github.com/mitchellh/mapstructure) +Requires: golang(github.com/pelletier/go-toml) +Requires: golang(github.com/spf13/afero) +Requires: golang(github.com/spf13/cast) +Requires: golang(github.com/spf13/jWalterWeatherman) +Requires: golang(github.com/spf13/pflag) +#Requires: golang(github.com/xordataexchange/crypt/config) +Requires: golang(gopkg.in/yaml.v2) Provides: golang(%{import_path}) = %{version}-%{release} @@ -89,11 +105,14 @@ Summary: Unit tests for %{name} package %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests #in %%check section need for running +BuildRequires: golang(github.com/stretchr/testify) %endif # test subpackage tests code from devel subpackage Requires: %{name}-devel = %{version}-%{release} +Requires: golang(github.com/stretchr/testify) + %description unit-test %{summary} @@ -166,10 +185,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test -f unit-test.file-list %license LICENSE -%doc README.md %endif %changelog +* Wed Jan 25 2017 Jan Chaloupka - 0-0.5.git1699063 +- Bump to upstream 16990631d4aa7e38f73dbbbf37fa13e67c648531 + resolves: #1414254 + * Thu Jul 21 2016 Fedora Release Engineering - 0-0.4.gitbe5ff3e - https://fedoraproject.org/wiki/Changes/golang1.7 diff --git a/sources b/sources index 2fb61a1..eb05f50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e08e22240aa55e7766f0eef7ebefb956 viper-be5ff3e.tar.gz +SHA512 (viper-1699063.tar.gz) = fe084cca714ecfd918e1fdc4ea30354a7937647f4c17c5ce82ec70e5abc4ff8c35ba0362d45085c2cdbf4278a94597bf013ebedde7d40a454660640d44e13694