7:23 a.m.
The package rpms/golang-github-prometheus-client_model.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_m....
Change:
-%ifarch 0%{?gccgo_arches}
Thanks.
Full change:
============
commit 53c2906b3b78e0550a6a56c25b3e2d9ebb88371e
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Sep 22 14:15:14 2017 +0200
Bump to upstream 6f3806018612930941127f2a7c6c453ba2c527d2
- related: #1250496
diff --git a/.gitignore b/.gitignore
index f464039..3457052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/client_model-fa8ad6f.tar.gz
+/client_model-6f38060.tar.gz
diff --git a/golang-github-prometheus-client_model.spec
b/golang-github-prometheus-client_model.spec
index 53c2f1a..950a245 100644
--- a/golang-github-prometheus-client_model.spec
+++ b/golang-github-prometheus-client_model.spec
@@ -1,17 +1,27 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
+# 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
-# No tests provided
+# Run tests in check section
%global with_check 0
+# Generate unit-test rpm
%global with_unit_test 0
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
%if 0%{?with_debug}
%global _dwz_low_mem_die_limit 0
@@ -19,13 +29,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
@@ -33,29 +36,21 @@
# https://github.com/prometheus/client_model
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
-%global commit fa8ad6fec33561be4280a8f0514318c79d7f6cb6
+%global commit 6f3806018612930941127f2a7c6c453ba2c527d2
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.11.git%{shortcommit}%{?dist}
+Release: 0.12.git%{shortcommit}%{?dist}
Summary: Data model artifacts for Prometheus
License: ASL 2.0
URL: https://%{provider_prefix}
Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%ifarch 0%{?gccgo_arches}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
-%endif
+# 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}
%description
%{summary}
@@ -84,18 +79,6 @@ building other packages which use import path with
%if 0%{?with_unit_test}
%package unit-test
Summary: Unit tests for %{name} package
-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%ifarch 0%{?gccgo_arches}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
-%endif
%if 0%{?with_check}
#Here comes all BuildRequires: PACKAGE the unit tests
@@ -142,34 +125,42 @@ done
%check
%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%ifarch 0%{?gccgo_arches}
-function gotest { %{gcc_go_test} "$@"; }
-%else
-%if 0%{?golang_test:1}
-function gotest { %{golang_test} "$@"; }
+%if ! 0%{?with_bundled}
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%else
-function gotest { go test "$@"; }
+# No dependency directories so far
+
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
+
+%if ! 0%{?gotest:1}
+%global gotest go test
%endif
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%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 metrics.proto
+%license LICENSE
+%doc *.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
-%doc README.md CONTRIBUTING.md AUTHORS.md
+%license LICENSE
+%doc *.md
%endif
%changelog
+* Fri Sep 22 2017 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.12.git6f38060
+- Bump to upstream 6f3806018612930941127f2a7c6c453ba2c527d2
+ related: #1250496
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.11.gitfa8ad6f
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index 5ff26ae..db0737e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-365731479ba179d4840dfd72cf6d8e55 client_model-fa8ad6f.tar.gz
+SHA512 (client_model-6f38060.tar.gz) =
5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf