From 69c8adcc6a48117fa47e8e37b370492918aad058 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Oct 19 2015 22:33:00 +0000
Subject: Bump to upstream e51041b3fa41cece0dca035740ba6411905be473

- related: #1214784

---

diff --git a/.gitignore b/.gitignore
index fff2c82..db340eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/client_golang-36659fa.tar.gz
+/client_golang-e51041b.tar.gz
diff --git a/golang-github-prometheus-client_golang.spec b/golang-github-prometheus-client_golang.spec
index ef10897..0ad73c2 100644
--- a/golang-github-prometheus-client_golang.spec
+++ b/golang-github-prometheus-client_golang.spec
@@ -18,13 +18,6 @@
 %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         prometheus
@@ -32,12 +25,12 @@
 # https://github.com/prometheus/client_golang
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          36659fa1ad85ee0dd33822b68a192a814c93a57b
+%global commit          e51041b3fa41cece0dca035740ba6411905be473
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-%{provider}-%{project}-%{repo}
-Version:        0.6.0
-Release:        3%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        Prometheus instrumentation library for Go applications
 License:        ASL 2.0
 URL:            https://%{provider_prefix}
@@ -65,25 +58,25 @@ Summary:       %{summary}
 BuildArch:     noarch
 
 %if 0%{?with_check}
-BuildRequires: golang(bitbucket.org/ww/goautoneg)
 BuildRequires: golang(github.com/beorn7/perks/quantile)
 BuildRequires: golang(github.com/golang/protobuf/proto)
-BuildRequires: golang(github.com/matttproud/golang_protobuf_extensions/pbutil)
-BuildRequires: golang(github.com/prometheus/client_model/go)
+BuildRequires: golang(github.com/prometheus/common/expfmt)
+BuildRequires: golang(github.com/prometheus/common/model)
 BuildRequires: golang(github.com/prometheus/procfs)
+BuildRequires: golang(golang.org/x/net/context)
+BuildRequires: golang(golang.org/x/net/context/ctxhttp)
 %endif
 
-Requires:      golang(bitbucket.org/ww/goautoneg)
 Requires:      golang(github.com/beorn7/perks/quantile)
 Requires:      golang(github.com/golang/protobuf/proto)
-Requires:      golang(github.com/matttproud/golang_protobuf_extensions/pbutil)
-Requires:      golang(github.com/prometheus/client_model/go)
+Requires:      golang(github.com/prometheus/common/expfmt)
+Requires:      golang(github.com/prometheus/common/model)
 Requires:      golang(github.com/prometheus/procfs)
+Requires:      golang(golang.org/x/net/context)
+Requires:      golang(golang.org/x/net/context/ctxhttp)
 
-Provides:      golang(%{import_path}/extraction) = %{version}-%{release}
-Provides:      golang(%{import_path}/model) = %{version}-%{release}
+Provides:      golang(%{import_path}/api/prometheus) = %{version}-%{release}
 Provides:      golang(%{import_path}/prometheus) = %{version}-%{release}
-Provides:      golang(%{import_path}/text) = %{version}-%{release}
 
 %description devel
 %{summary}
@@ -155,11 +148,6 @@ for file in $(find ./extraction/ -iname "*.json"); do
     cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
     echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
 done
-for file in ./text/testdata/*; 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
 
 %check
@@ -175,31 +163,37 @@ function gotest { go test "$@"; }
 %endif
 
 export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-gotest %{import_path}/extraction
 # Test failed on x86_64: signature_test.go:265: expected LabelsToSignature with
 # empty labels not to perform allocations
 #gotest %{import_path}/model
 # Test failed on i686: go_collector_test.go:108: want 1 new garbage collection
 # run, got 2
 #gotest %{import_path}/prometheus
-gotest %{import_path}/text
+gotest %{import_path}/api/prometheus
 %endif
 
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
 %if 0%{?with_devel}
 %files devel -f devel.file-list
-%copying LICENSE
-%doc README.md CONTRIBUTING.md AUTHORS.md CHANGELOG.md Godeps/Godeps.json
+%license LICENSE
+%doc README.md CONTRIBUTING.md AUTHORS.md CHANGELOG.md
 %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
 %dir %{gopath}/src/%{import_path}
 %endif
 
 %if 0%{?with_unit_test}
 %files unit-test -f unit-test.file-list
-%copying LICENSE
+%license LICENSE
 %doc README.md CONTRIBUTING.md AUTHORS.md CHANGELOG.md
 %endif
 
 %changelog
+* Mon Oct 19 2015 jchaloup <jchaloup@redhat.com> - 0.7.0-1
+- Bump to upstream e51041b3fa41cece0dca035740ba6411905be473
+  related: #1214784
+
 * Mon Aug 17 2015 jchaloup <jchaloup@redhat.com> - 0.6.0-3
 - Add Godeps.json to doc
   related: #1214784
diff --git a/sources b/sources
index d5af92a..9fa4171 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c18db144d867a4a7aa593f212d66802b  client_golang-36659fa.tar.gz
+87529164431fc6560a228cd7defc975d  client_golang-e51041b.tar.gz