From 7c0ae9ca95280c42d51f7a9935a2da9d6676fe26 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Mar 06 2017 11:45:45 +0000
Subject: Use the default weather import path prefix

- related: #1414254

---

diff --git a/change-import-path.patch b/change-import-path.patch
deleted file mode 100644
index a7787a7..0000000
--- a/change-import-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 53b0f0aecd79028dacf1cffbf3ef87bffc14dd05 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Wed, 25 Jan 2017 10:32:31 +0100
-Subject: [PATCH] change import paths
-
----
- util.go  | 2 +-
- viper.go | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/util.go b/util.go
-index fe6cb45..94c4398 100644
---- a/util.go
-+++ b/util.go
-@@ -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"
- 	"gopkg.in/yaml.v2"
- )
- 
-diff --git a/viper.go b/viper.go
-index f17790e..6ae3640 100644
---- a/viper.go
-+++ b/viper.go
-@@ -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"
- 	"github.com/spf13/pflag"
- )
- 
--- 
-2.7.4
-
diff --git a/golang-github-spf13-viper.spec b/golang-github-spf13-viper.spec
index e87dbae..92e919b 100644
--- a/golang-github-spf13-viper.spec
+++ b/golang-github-spf13-viper.spec
@@ -42,14 +42,12 @@
 
 Name:           golang-%{provider}-%{project}-%{repo}
 Version:        0
-Release:        0.6.git%{shortcommit}%{?dist}
+Release:        0.7.git%{shortcommit}%{?dist}
 Summary:        Go configuration with fangs
 License:        MIT
 URL:            https://%{provider_prefix}
 Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
 
-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 aarch64 %{arm}}
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
@@ -71,7 +69,7 @@ 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/jwalterweatherman)
 BuildRequires: golang(github.com/spf13/pflag)
 #BuildRequires: golang(github.com/xordataexchange/crypt/config)
 BuildRequires: golang(gopkg.in/yaml.v2)
@@ -84,7 +82,7 @@ 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/jwalterweatherman)
 Requires: golang(github.com/spf13/pflag)
 #Requires: golang(github.com/xordataexchange/crypt/config)
 Requires: golang(gopkg.in/yaml.v2)
@@ -122,7 +120,6 @@ providing packages with %{import_path} prefix.
 
 %prep
 %setup -q -n %{repo}-%{commit}
-%patch0 -p1
 
 %build
 
@@ -188,6 +185,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %endif
 
 %changelog
+* Mon Mar 06 2017 Jan Chaloupka <jchaloup@redhat.com> - 0-0.7.git1699063
+- Use the default weather import path prefix
+  related: #1414254
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.6.git1699063
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild