The package rpms/golang-github-prometheus-client.git has added or updated architecture
specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-prometheus-client.g....
Change:
+%ifarch %{ix86} &{arm}
Thanks.
Full change:
============
commit 5b4fdbcb47ac8a3d9e8dd67b5295c8cd8598a625
Author: Maxwell G <gotmax(a)e.email>
Date: Sat May 7 22:26:07 2022 -0500
Update to 1.12.1 Close: rhbz#2042592 rhbz#2067400
- Mitigate CVE-2022-21698 (rhbz#2067400).
diff --git a/.gitignore b/.gitignore
index cb622c3..a1f6128 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
/client_golang-1.7.1.tar.gz
/client_golang-1.9.0.tar.gz
/client_golang-1.11.0.tar.gz
+/client_golang-1.12.1.tar.gz
+/client_golang-1.12.2.tar.gz
diff --git a/golang-github-prometheus-client.spec b/golang-github-prometheus-client.spec
index d436c8a..9f3328b 100644
--- a/golang-github-prometheus-client.spec
+++ b/golang-github-prometheus-client.spec
@@ -1,9 +1,10 @@
-# Generated by go2rpm 1.5.0
+# Generated by go2rpm 1.6.0
%bcond_without check
+%global debug_package %{nil}
#
https://github.com/prometheus/client_golang
%global goipath
github.com/prometheus/client_golang
-Version: 1.11.0
+Version: 1.12.2
%gometa
@@ -27,18 +28,6 @@ Summary: Prometheus instrumentation library for Go applications
License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
-Source1: glide.yaml
-Source2: glide.lock
-
-BuildRequires:
golang(github.com/beorn7/perks/quantile)
-BuildRequires:
golang(github.com/cespare/xxhash/v2)
-BuildRequires:
golang(github.com/golang/protobuf/proto)
-BuildRequires:
golang(github.com/golang/protobuf/ptypes)
-BuildRequires:
golang(github.com/json-iterator/go)
-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)
%description
%{common_description}
@@ -47,23 +36,27 @@ BuildRequires:
golang(github.com/prometheus/procfs)
%prep
%goprep
-cp %{S:1} %{S:2} .
-mv prometheus/README.md README-prometheus.md
+
+%generate_buildrequires
+%go_generate_buildrequires
%install
%gopkginstall
+mv prometheus/README.md README-prometheus.md
%if %{with check}
%check
-# Don't test this with prometheus/common bootstrap
-rm -rfv api/prometheus/v1/example_test.go
# Fails on some arch with Go 1.16
-for test in "TestSummaryDecay" \
+for test in "TestSummaryDecay" "TestMemStatsEquivalence"
"TestBuckets" \
; do
awk -i inplace '/^func.*'"$test"'\(/ { print; print
"\tt.Skip(\"disabled failing test\")"; next}1' $(grep -rl $test)
done
+%ifarch %{ix86} &{arm}
+%gocheck -d api/prometheus/v1
+%else
%gocheck
%endif
+%endif
%gopkgfiles
diff --git a/sources b/sources
index 129a1bf..803e466 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (client_golang-1.11.0.tar.gz) =
6789334d6dfe0bdaeaa4896a8f37ab11caf33345574473e52bc63403d8919bd60ce7b9e0d66d1b82c77adb4a03e99c12b8aac3f9dec0ed46f0c47d51240db3df
+SHA512 (client_golang-1.12.2.tar.gz) =
84b1cae9e468658b85b897132b13668fd7c427a9174b47ea95c0f09123215b052fb5454830842ab020752525406cccef4cf0e934f448fa88d9b7d88ac1749362