From ed77f741887e7064af69cca5371ae85d27e9c943b455788ba47e90a2cfe32098 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Thu, 6 Oct 2022 08:18:27 +0000 Subject: [PATCH] Accepting request 1006390 from home:dirkmueller:Factory - switch to go1.17 as upstream does (see https://github.com/prometheus/promu/blob/v0.13.0/.promu.yml) - remove go_nostrip as it isn't necessary with 1.17 anymore OBS-URL: https://build.opensuse.org/request/show/1006390 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-promu?expand=0&rev=22 --- golang-github-prometheus-promu.changes | 6 ++++++ golang-github-prometheus-promu.spec | 27 ++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/golang-github-prometheus-promu.changes b/golang-github-prometheus-promu.changes index 9e8f5ee..ed4c36a 100644 --- a/golang-github-prometheus-promu.changes +++ b/golang-github-prometheus-promu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 27 12:37:42 UTC 2022 - Dirk Müller + +- switch to go1.17 as upstream does (see https://github.com/prometheus/promu/blob/v0.13.0/.promu.yml) +- remove go_nostrip as it isn't necessary with 1.17 anymore + ------------------------------------------------------------------- Tue May 10 15:22:43 UTC 2022 - Jordi Massaguer diff --git a/golang-github-prometheus-promu.spec b/golang-github-prometheus-promu.spec index 0bf6a8d..6a0f30e 100644 --- a/golang-github-prometheus-promu.spec +++ b/golang-github-prometheus-promu.spec @@ -16,13 +16,6 @@ # -%if 0%{?rhel} -# Fix ERROR: No build ID note found in -%undefine _missing_build_ids_terminate_build -%endif - -%{go_nostrip} - Name: golang-github-prometheus-promu Version: 0.13.0 Release: 0 @@ -34,14 +27,15 @@ Source: promu-%{version}.tar.gz Source1: vendor.tar.gz Patch1: 0001-Set-build-date-from-SOURCE_DATE_EPOCH.patch BuildRequires: golang-packaging -%if 0%{?rhel} -BuildRequires: golang >= 1.15 -%else -BuildRequires: golang(API) = 1.15 -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 %{go_provides} +%if 0%{?rhel} +# Fix ERROR: No build ID note found in +%undefine _missing_build_ids_terminate_build +BuildRequires: golang >= 1.17 +%else +BuildRequires: golang(API) = 1.17 +%endif %description The Prometheus Utility Tool is used by the Prometheus project to build other components. @@ -50,7 +44,7 @@ The Prometheus Utility Tool is used by the Prometheus project to build other com %autosetup -a1 -p1 -n promu-%{version} %build -%goprep github.com/prometheus/promu +%{goprep} github.com/prometheus/promu export VERSION=%{version} export CGO_ENABLED=0 go build \ @@ -61,12 +55,11 @@ go build \ %install install -D -m 0755 promu "%{buildroot}/%{_bindir}/promu" -%gosrc +%{gosrc} -%gofilelist +%{gofilelist} %files -f file.lst -%defattr(-,root,root,-) %doc README.md %license LICENSE %{_bindir}/promu