diff --git a/.gitignore b/.gitignore index a57d754..cc08dbc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/client_golang-449ccef.tar.gz +/client_golang-c5b7fcc.tar.gz diff --git a/golang-github-prometheus-client_golang.spec b/golang-github-prometheus-client_golang.spec index 1e0b7f1..5c1ba17 100644 --- a/golang-github-prometheus-client_golang.spec +++ b/golang-github-prometheus-client_golang.spec @@ -1,16 +1,28 @@ -%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 -%global with_check 1 -%global with_unit_test 1 -%else -%global with_devel 0 -%global with_bundled 0 -%global with_debug 0 +# Run tests in check section +# Cyclic deps between common and client again %global with_check 0 -%global with_unit_test 0 -%endif +# Generate unit-test rpm +%global with_unit_test 1 %if 0%{?with_debug} %global _dwz_low_mem_die_limit 0 @@ -25,12 +37,12 @@ # https://github.com/prometheus/client_golang %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 449ccefff16c8e2b7229f6be1921ba22f62461fe +%global commit c5b7fccd204277076155f10851dad72b76a49317 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: golang-%{provider}-%{project}-%{repo} Version: 0.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Prometheus instrumentation library for Go applications License: ASL 2.0 URL: https://%{provider_prefix} @@ -71,6 +83,8 @@ Requires: golang(golang.org/x/net/context/ctxhttp) Provides: golang(%{import_path}/api/prometheus) = %{version}-%{release} Provides: golang(%{import_path}/prometheus) = %{version}-%{release} +Provides: golang(%{import_path}/prometheus/promhttp) = %{version}-%{release} +Provides: golang(%{import_path}/prometheus/push) = %{version}-%{release} %description devel %{summary} @@ -171,6 +185,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Wed Mar 15 2017 Jan Chaloupka - 0.7.0-7 +- Bump to upstream c5b7fccd204277076155f10851dad72b76a49317 + related: #1214784 + * Fri Feb 10 2017 Fedora Release Engineering - 0.7.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 4c2a93d..ce1238d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95df7f0e78893d3b9ae6a0f2ae53fdea client_golang-449ccef.tar.gz +SHA512 (client_golang-c5b7fcc.tar.gz) = 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7