From 7ee98503cdbf70e974af1b6c3670c5421208abe6 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Apr 07 2018 08:35:27 +0000
Subject: Update to spec 3.0


---

diff --git a/.gitignore b/.gitignore
index 53acdc3..6cc5b19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/viper-c1de958.tar.gz
-/viper-25b30aa.tar.gz
+/viper-1.0.0.tar.gz
diff --git a/golang-github-spf13-viper.spec b/golang-github-spf13-viper.spec
index 0e40d63..2d3e645 100644
--- a/golang-github-spf13-viper.spec
+++ b/golang-github-spf13-viper.spec
@@ -1,67 +1,24 @@
-# 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
-# Run tests in check section
-# constant 765432101234567 overflows int
-%global with_check 0
-# 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         spf13
-%global repo            viper
-# https://github.com/spf13/viper
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path     %{provider_prefix}
-%global commit          25b30aa063fc18e48662b86996252eabdcf2f0c7
-%global shortcommit     %(c=%{commit}; echo ${c:0:7})
-
-Name:           golang-%{provider}-%{project}-%{repo}
+# http://github.com/spf13/viper
+%global goipath         github.com/spf13/viper
+%global gcommit         25b30aa063fc18e48662b86996252eabdcf2f0c7
 Version:        1.0.0
-Release:        1%{?dist}
+
+%gometa
+
+Name:           %{goname}
+Release:        2%{?dist}
 Summary:        Go configuration with fangs
 License:        MIT
-URL:            https://%{provider_prefix}
-Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.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}
+URL:            %{gourl}
+Source0:        %{gosource}
 
 %description
 %{summary}
 
-%if 0%{?with_devel}
 %package devel
 Summary:       %{summary}
 BuildArch:     noarch
 
-%if 0%{?with_check}
 BuildRequires: golang(github.com/fsnotify/fsnotify)
 BuildRequires: golang(github.com/hashicorp/hcl)
 BuildRequires: golang(github.com/magiconair/properties)
@@ -71,120 +28,44 @@ 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/xordataexchange/crypt/config)
 BuildRequires: golang(gopkg.in/yaml.v2)
-%endif
-
-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}
+# tests
+BuildRequires: golang(github.com/stretchr/testify/assert)
 
 %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
-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}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{goipath} prefix.
 
 %prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
 
 %install
 rm -rf remote
 # 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") ; 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"); 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.file-list
-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}
+#constant 765432101234567 overflows int
+%ifarch %{ix86} || %{arm}
+%gochecks -d .
 %else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
+%gochecks
 %endif
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
-%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 -f unit-test.file-list
-%license LICENSE
-%endif
 
 %changelog
+* Fri Apr 06 2018 Jan Chaloupka <jchaloup@redhat.com> - 1.0.0-2.git25b30aa
+- Update to spec 3.0
+
 * Wed Feb 21 2018 Kaushal <kshlmster@gmail.com> - 1.0.0-1
 - Update to upstream v1.0.0
 
diff --git a/sources b/sources
index 5ef913d..aa947bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (viper-25b30aa.tar.gz) = 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
+SHA512 (viper-1.0.0.tar.gz) = a9264fb09dd9d069f3ec1543a32c55a1268e6b33c3715da9116fe6e23f7b6f179785331f07f13cc03db29eb38f017eb5e8569e144bcaafbd73801857e0387504