diff --git a/.gitignore b/.gitignore index 48e13a9..a45c8bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /go-metrics-6c5fa0d8f48f4661c9ba8709799c88d425ad20f0.tar.gz +/go-metrics-f0300d1749da6fa982027e449ec0c7a145510c3c.tar.gz diff --git a/0001-Fix-TFatalf-has-arg-got-of-wrong-type.patch b/0001-Fix-TFatalf-has-arg-got-of-wrong-type.patch new file mode 100644 index 0000000..85ceebb --- /dev/null +++ b/0001-Fix-TFatalf-has-arg-got-of-wrong-type.patch @@ -0,0 +1,41 @@ +From cc7560c89d0901592855bf8feb443a711cc99b3f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= + <30413512+eclipseo@users.noreply.github.com> +Date: Tue, 13 Nov 2018 17:34:23 +0100 +Subject: [PATCH] Fix T.Fatalf has arg got of wrong type + +--- + start_test.go | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/start_test.go b/start_test.go +index 872d358..8ff5ca0 100644 +--- a/start_test.go ++++ b/start_test.go +@@ -53,7 +53,7 @@ func Test_GlobalMetrics(t *testing.T) { + t.Fatalf("got key %s want %s", got, want) + } + if got, want := s.vals[0], tt.val; !reflect.DeepEqual(got, want) { +- t.Fatalf("got val %s want %s", got, want) ++ t.Fatalf("got val %v want %v", got, want) + } + }) + } +@@ -82,7 +82,7 @@ func Test_GlobalMetrics_Labels(t *testing.T) { + t.Fatalf("got key %s want %s", got, want) + } + if got, want := s.vals[0], tt.val; !reflect.DeepEqual(got, want) { +- t.Fatalf("got val %s want %s", got, want) ++ t.Fatalf("got val %v want %v", got, want) + } + if got, want := s.labels[0], tt.labels; !reflect.DeepEqual(got, want) { + t.Fatalf("got val %s want %s", got, want) +@@ -124,7 +124,7 @@ func Test_GlobalMetrics_DefaultLabels(t *testing.T) { + t.Fatalf("got key %s want %s", got, want) + } + if got, want := s.vals[0], tt.val; !reflect.DeepEqual(got, want) { +- t.Fatalf("got val %s want %s", got, want) ++ t.Fatalf("got val %v want %v", got, want) + } + if got, want := s.labels[0], tt.labels; !reflect.DeepEqual(got, want) { + t.Fatalf("got val %s want %s", got, want) diff --git a/golang-github-armon-go-metrics.spec b/golang-github-armon-go-metrics.spec index 6a0b91d..394830c 100644 --- a/golang-github-armon-go-metrics.spec +++ b/golang-github-armon-go-metrics.spec @@ -1,12 +1,12 @@ # https://github.com/armon/go-metrics %global goipath github.com/armon/go-metrics -%global commit 6c5fa0d8f48f4661c9ba8709799c88d425ad20f0 +%global commit f0300d1749da6fa982027e449ec0c7a145510c3c -%gometa -i +%gometa Name: golang-github-armon-go-metrics Version: 0 -Release: 0.16%{?dist} +Release: 0.17%{?dist} Summary: Exporting performance and runtime metrics to external metrics systems License: MIT URL: %{gourl} @@ -14,6 +14,8 @@ Source0: %{gosource} Source1: glide.lock Source2: glide.yaml +Patch0: 0001-Fix-TFatalf-has-arg-got-of-wrong-type.patch + %description %{summary} @@ -21,8 +23,12 @@ Source2: glide.yaml Summary: %{summary} BuildArch: noarch -BuildRequires: golang(github.com/prometheus/client_golang/prometheus) BuildRequires: golang(github.com/DataDog/datadog-go/statsd) +BuildRequires: golang(github.com/circonus-labs/circonus-gometrics) +BuildRequires: golang(github.com/hashicorp/go-immutable-radix) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +# Test +BuildRequires: golang(github.com/pascaldekloe/goe/verify) %description devel %{summary} @@ -32,7 +38,7 @@ building other packages which use import path with %{goipath} prefix. %prep -%forgesetup +%forgeautosetup -p1 cp %{SOURCE1} %{SOURCE2} . %install @@ -46,15 +52,17 @@ cp %{SOURCE1} %{SOURCE2} . %doc README.md %changelog -* Tue Oct 23 2018 Nicolas Mailhot -- 0-0.16 +* Mon Nov 12 2018 Robert-André Mauchin - 0-0.17.20181112gitf0300d1 +- Bump to commit f0300d1749da6fa982027e449ec0c7a145510c3c + +* Tue Oct 23 2018 Nicolas Mailhot - 0-0.16.20150820git6c5fa0d - redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias - https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/ -* Fri Jul 13 2018 Fedora Release Engineering - Forge-specific packaging variables +* Fri Jul 13 2018 Fedora Release Engineering - 0-0.15.git6c5fa0d - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Fri Jun 08 2018 Jan Chaloupka - 0-0.14.git6c5fa0d +* Fri Jun 08 2018 Jan Chaloupka - 0-0.14.20150820git6c5fa0d - Update to spec 3.0 Upload glide.lock and glide.yaml diff --git a/sources b/sources index e38122e..a72381b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go-metrics-6c5fa0d8f48f4661c9ba8709799c88d425ad20f0.tar.gz) = 4731770d959dd23dca0c3917c37d5cd68032e8ef00f63b2521f5816c8fc03e74149b58924cea8a42a217648e5c052eea67b5e261fe62727ac032fcd2832e05ab +SHA512 (go-metrics-f0300d1749da6fa982027e449ec0c7a145510c3c.tar.gz) = 6388b3b4e20cf0511bbe3c8d8e58493aa8d80d64f6fa74db26e06df89ebea25cdafb476b65d46a12fc920ecf6ffaa1ecf991adec1033572c5015e4e64ef8be61