From 02546398a60e9627dd7194115da1e37042eacee14c336b916a3f2e178f73f770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Wed, 4 Mar 2020 17:25:30 +0000
Subject: [PATCH] Accepting request 772196 from
 home:witekbedyk:branches:server:monitoring

- Update to 0.5.0
  + Features:
    * Add support for aix/ppc64. #151
    * Fallback to git describe output if no VERSION. #130
    * Make extldflags extensible by configuration. #125
  + Enhancements:
    * cmd/release: add --timeout option. #142
    * cmd/release: create release in GitHub if none exists. #148
    * Avoid bind-mounting to allow building with a remote docker engine #95
  + Bug Fixes:
    * cmd/tarball: restore --prefix flag. #133
    * cmd/release: don't leak credentials in case of error. #136
- Use obs-service-go_modules

OBS-URL: https://build.opensuse.org/request/show/772196
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-promu?expand=0&rev=6
---
 _service                               | 12 ++++++++----
 golang-github-prometheus-promu.changes | 18 ++++++++++++++++++
 golang-github-prometheus-promu.spec    | 23 +++++++++++++++--------
 promu-0.2.0.tar.xz                     |  3 ---
 promu-0.5.0.tar.gz                     |  3 +++
 vendor.tar.gz                          |  3 +++
 6 files changed, 47 insertions(+), 15 deletions(-)
 delete mode 100644 promu-0.2.0.tar.xz
 create mode 100644 promu-0.5.0.tar.gz
 create mode 100644 vendor.tar.gz

diff --git a/_service b/_service
index 34d08e6..0bbbfc2 100644
--- a/_service
+++ b/_service
@@ -3,14 +3,18 @@
     <param name="url">https://github.com/prometheus/promu.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">0.2.0</param>
-    <param name="revision">v0.2.0</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="revision">v0.5.0</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
   </service>
   <service name="recompress" mode="disabled">
-    <param name="file">promu-*.tar</param>
-    <param name="compression">xz</param>
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
   </service>
   <service name="set_version" mode="disabled">
     <param name="basename">promu</param>
   </service>
+  <service name="go_modules" mode="disabled">
+    <param name="archive">promu-0.5.0.tar.gz</param>
+  </service>
 </services>
diff --git a/golang-github-prometheus-promu.changes b/golang-github-prometheus-promu.changes
index 8df6a88..9d0bb90 100644
--- a/golang-github-prometheus-promu.changes
+++ b/golang-github-prometheus-promu.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Feb  7 17:13:26 UTC 2020 - Witek Bedyk <witold.bedyk@suse.com>
+
+- Update to 0.5.0
+  + Features:
+    * Add support for aix/ppc64. #151
+    * Fallback to git describe output if no VERSION. #130
+    * Make extldflags extensible by configuration. #125
+  + Enhancements:
+    * cmd/release: add --timeout option. #142
+    * cmd/release: create release in GitHub if none exists. #148
+    * Avoid bind-mounting to allow building with a remote docker engine #95
+  + Bug Fixes:
+    * cmd/tarball: restore --prefix flag. #133
+    * cmd/release: don't leak credentials in case of error. #136
+
+- Use obs-service-go_modules
+
 -------------------------------------------------------------------
 Fri Feb  8 11:05:48 UTC 2019 - Jan Fajerski <jan.fajerski@suse.com>
 
diff --git a/golang-github-prometheus-promu.spec b/golang-github-prometheus-promu.spec
index d7b0cc4..a8c5462 100644
--- a/golang-github-prometheus-promu.spec
+++ b/golang-github-prometheus-promu.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package golang-github-prometheus-promu
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,16 @@
 %{go_nostrip}
 
 Name:           golang-github-prometheus-promu
-Version:        0.2.0
+Version:        0.5.0
 Release:        0
 Summary:        Prometheus Utility Tool
 License:        Apache-2.0
 Group:          System/Management
-Url:            https://github.com/prometheus/promu
-Source:         promu-%{version}.tar.xz
-BuildRequires:  go1.11
+URL:            https://github.com/prometheus/promu
+Source:         promu-%{version}.tar.gz
+Source1:        vendor.tar.gz
+BuildRequires:  go >= 1.11
 BuildRequires:  golang-packaging
-BuildRequires:  xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{go_provides}
 
@@ -37,13 +37,20 @@ The Prometheus Utility Tool is used by the Prometheus project to build other com
 
 %prep
 %setup -q -n promu-%{version}
+%setup -q -T -D -a 1 -n promu-%{version}
 
 %build
 %goprep github.com/prometheus/promu
-%gobuild
+export VERSION=%{version}
+export CGO_ENABLED=0
+go build \
+   -mod=vendor \
+   -buildmode=pie \
+   -ldflags "-s -w -X main.version=$VERSION" \
+   -o promu ;
 
 %install
-%goinstall
+install -D -m 0755 promu "%{buildroot}/%{_bindir}/promu"
 %gosrc
 
 %gofilelist
diff --git a/promu-0.2.0.tar.xz b/promu-0.2.0.tar.xz
deleted file mode 100644
index 02cc5a2..0000000
--- a/promu-0.2.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ffb06771bf63610296b557f6879b8e4e8a2086bc96133353e657b9d1edf2e9b0
-size 451812
diff --git a/promu-0.5.0.tar.gz b/promu-0.5.0.tar.gz
new file mode 100644
index 0000000..68661af
--- /dev/null
+++ b/promu-0.5.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0721abc6fb17e1f2fb362f3111b55557c9c9d81711d086b28c661e854e061582
+size 4834254
diff --git a/vendor.tar.gz b/vendor.tar.gz
new file mode 100644
index 0000000..003a21b
--- /dev/null
+++ b/vendor.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcc6bf112558a4910043eaba18c284860707ab98092f0c294add5e136aba507e
+size 610746