[golang-github-prometheus-client_golang/el6] Bump to upstream e5098ac1ff13c7f85b68b120b253dd834ba49682 - related: #1190442

Jan Chaloupka jchaloup at fedoraproject.org
Thu Mar 5 12:07:50 UTC 2015


commit fd08ccf39b328bdf6f56f952b90530d18cc8964a
Author: Jan Chaloupka <jchaloup at redhat.com>
Date:   Thu Mar 5 12:42:56 2015 +0100

    Bump to upstream e5098ac1ff13c7f85b68b120b253dd834ba49682
    - related: #1190442

 .gitignore                                  |  2 +-
 golang-github-prometheus-client_golang.spec | 41 +++++++++++------------------
 sources                                     |  2 +-
 3 files changed, 18 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 019c6d8..83ef1e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/client_golang-39e4bc8.tar.gz
+/client_golang-e5098ac.tar.gz
diff --git a/golang-github-prometheus-client_golang.spec b/golang-github-prometheus-client_golang.spec
index 779f4b8..26b7cdf 100644
--- a/golang-github-prometheus-client_golang.spec
+++ b/golang-github-prometheus-client_golang.spec
@@ -4,12 +4,12 @@
 %global project         prometheus
 %global repo            client_golang
 %global import_path     %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit          39e4bc83f974fb141a9e67c042b26322bacc917b
+%global commit          e5098ac1ff13c7f85b68b120b253dd834ba49682
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-%{provider}-%{project}-%{repo}
 Version:        0
-Release:        0.2.git%{shortcommit}%{?dist}
+Release:        0.3.git%{shortcommit}%{?dist}
 Summary:        Prometheus instrumentation library for Go applications
 License:        ASL 2.0
 URL:            https://%{import_path}
@@ -25,32 +25,24 @@ ExclusiveArch:  %{ix86} x86_64 %{arm}
 
 %package devel
 BuildRequires:  golang >= 1.2.1-3
+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/ext)
 BuildRequires:  golang(github.com/prometheus/client_model/go)
-BuildRequires:  golang(code.google.com/p/goprotobuf/proto)
-BuildRequires:  golang(github.com/bmizerany/perks/quantile)
-BuildRequires:  golang(github.com/beorn7/perks/quantile)
-#BuildRequires:  golang(github.com/prometheus/prometheus/utility/test)
 BuildRequires:  golang(github.com/prometheus/procfs)
 Requires:       golang >= 1.2.1-3
+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/ext)
 Requires:       golang(github.com/prometheus/client_model/go)
-Requires:       golang(code.google.com/p/goprotobuf/proto)
-Requires:       golang(github.com/bmizerany/perks/quantile)
-Requires:       golang(github.com/beorn7/perks/quantile)
-#Requires:       golang(github.com/prometheus/prometheus/utility/test)
 Requires:       golang(github.com/prometheus/procfs)
 Summary:        %{summary}
-Provides:       golang(%{import_path}/examples/random) = %{version}-%{release}
-Provides:       golang(%{import_path}/examples/simple) = %{version}-%{release}
 Provides:       golang(%{import_path}/extraction) = %{version}-%{release}
 Provides:       golang(%{import_path}/model) = %{version}-%{release}
 Provides:       golang(%{import_path}/prometheus) = %{version}-%{release}
 Provides:       golang(%{import_path}/text) = %{version}-%{release}
-Provides:       golang(%{import_path}/_vendor/goautoneg) = %{version}-%{release}
-Provides:       golang(%{import_path}/_vendor/perks/histogram) = %{version}-%{release}
-Provides:       golang(%{import_path}/_vendor/perks/quantile) = %{version}-%{release}
-Provides:       golang(%{import_path}/_vendor/perks/topk) = %{version}-%{release}
 
 %description devel
 %{summary}
@@ -70,21 +62,16 @@ cp -rpav prometheus %{buildroot}/%{gopath}/src/%{import_path}/
 cp -rpav model %{buildroot}/%{gopath}/src/%{import_path}/
 cp -rpav extraction %{buildroot}/%{gopath}/src/%{import_path}/
 cp -rpav examples %{buildroot}/%{gopath}/src/%{import_path}/
-cp -rpav _vendor %{buildroot}/%{gopath}/src/%{import_path}/
 
 pushd %{buildroot}/%{gopath}/src/%{import_path}
 rm -rf $(find . -iname .gitignore)
 popd
 
 %check
-#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/text
-#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/prometheus
-#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/model
-#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/extraction
-#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/_vendor/perks/topk
-#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/_vendor/perks/quantile
-#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/_vendor/perks/histogram
-#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/_vendor/goautoneg
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/text
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/prometheus
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/model
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/extraction
 
 %files devel
 %doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md README.md LICENSE
@@ -92,6 +79,10 @@ popd
 %{gopath}/src/%{import_path}
 
 %changelog
+* Wed Mar 04 2015 jchaloup <jchaloup at redhat.com> - 0-0.3.gite5098ac
+- Bump to upstream e5098ac1ff13c7f85b68b120b253dd834ba49682
+  related: #1190442
+
 * Thu Feb 26 2015 jchaloup <jchaloup at redhat.com> - 0-0.2.git39e4bc8
 - Bump to upstream 39e4bc83f974fb141a9e67c042b26322bacc917b
   related: #1190442
diff --git a/sources b/sources
index b04d717..a4dedfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41470e38ba154804d8a10dd8267799fd  client_golang-39e4bc8.tar.gz
+b1134852d903900f2b1e2d6aaad432b3  client_golang-e5098ac.tar.gz


More information about the scm-commits mailing list