From 578d56d11ad04e6b8176d5ea512729d8627a33f9c01e20d830a033f334f917ec Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Tue, 26 Jun 2018 13:57:56 +0000
Subject: [PATCH] Accepting request 617300 from
 home:mcalmer:branches:server:monitoring

- Update to version 5.1.3:
  * Heatmap support for Prometheus
  * Align Zero-Line for Right and Left Y-axes
  * allow setting the database
  * MSSQL Data Source
  * support multiple histogram series
  * support cloudwatch high resolution query
  * Added radiation units
  * Modify Grafana Pagerduty notifier to use Pagerduty API V2
  * prometheus editor: variable autocomplete support
  * Use net.SplitHostPort to support IPv6
  * See /usr/share/doc/packages/grafana/CHANGELOG.md for more details

- remove unknown build flag -s

need working phantomjs and new go

OBS-URL: https://build.opensuse.org/request/show/617300
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=7
---
 _service             |  4 ++--
 _servicedata         |  2 +-
 grafana-5.0.0.tar.xz |  3 ---
 grafana-5.1.3.tar.xz |  3 +++
 grafana.changes      | 21 +++++++++++++++++++++
 grafana.spec         |  6 +++---
 6 files changed, 30 insertions(+), 9 deletions(-)
 delete mode 100644 grafana-5.0.0.tar.xz
 create mode 100644 grafana-5.1.3.tar.xz

diff --git a/_service b/_service
index a6db7f5..72b3b22 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/grafana/grafana</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">5.0.0</param>
-    <param name="revision">v5.0.0</param>
+    <param name="versionformat">5.1.3</param>
+    <param name="revision">v5.1.3</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="disabled">
diff --git a/_servicedata b/_servicedata
index d05551f..281f775 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">https://github.com/grafana/grafana</param>
-          <param name="changesrevision">af6e28366bf3413ee3af56c540513dd70f467c41</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">ab0dc3f086d000d0eabade60080d939b6234b223</param></service></servicedata>
\ No newline at end of file
diff --git a/grafana-5.0.0.tar.xz b/grafana-5.0.0.tar.xz
deleted file mode 100644
index 17049f7..0000000
--- a/grafana-5.0.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5647b158b4961fba4f70c945c74610a4baf25eca607aa892a22d3582d83cfed1
-size 30139268
diff --git a/grafana-5.1.3.tar.xz b/grafana-5.1.3.tar.xz
new file mode 100644
index 0000000..bb99bba
--- /dev/null
+++ b/grafana-5.1.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2f6b983c888b99127055eba599683b55dc0e1cb768a04a2a11b76ca11a7e5ef
+size 30437932
diff --git a/grafana.changes b/grafana.changes
index 206c016..1dd8132 100644
--- a/grafana.changes
+++ b/grafana.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Sat Jun 16 16:04:55 UTC 2018 - opensuse-packaging@opensuse.org
+
+- Update to version 5.1.3:
+  * Heatmap support for Prometheus
+  * Align Zero-Line for Right and Left Y-axes
+  * allow setting the database
+  * MSSQL Data Source
+  * support multiple histogram series
+  * support cloudwatch high resolution query
+  * Added radiation units
+  * Modify Grafana Pagerduty notifier to use Pagerduty API V2
+  * prometheus editor: variable autocomplete support
+  * Use net.SplitHostPort to support IPv6
+  * See /usr/share/doc/packages/grafana/CHANGELOG.md for more details
+
+-------------------------------------------------------------------
+Sat Jun 16 16:01:25 UTC 2018 - mc@suse.com
+
+- remove unknown build flag -s
+
 -------------------------------------------------------------------
 Sat May  5 09:47:06 UTC 2018 - dmueller@suse.com
 
diff --git a/grafana.spec b/grafana.spec
index f758e7e..4241e95 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:           grafana
-Version:        5.0.0
+Version:        5.1.3
 Release:        0
 Summary:        Dashboards and editors for Graphite, InfluxDB, OpenTSDB
 License:        Apache-2.0
@@ -68,7 +68,7 @@ dashboards and data with teams.
 # (The %%gobuild macro can't take quoted strings; they get split up when
 # expanded to $extra_flags in process_build() in /usr/lib/rpm/golang.sh.)
 export IMPORTPATH="github.com/grafana/grafana"
-export BUILDFLAGS="-s -v -p 4 -x -buildmode=pie"
+export BUILDFLAGS="-v -p 4 -x -buildmode=pie"
 export GOPATH=%{_builddir}/go:%{_builddir}/contrib
 export GOBIN=%{_builddir}/go/bin
 go install $BUILDFLAGS -ldflags '-X main.version=%{version}' $IMPORTPATH/pkg/cmd/...
@@ -104,7 +104,7 @@ install -d -m755 %{buildroot}%{_datadir}/%{name}/tools
 # will not work for other architectures, so instead we remove the phantomjs
 # binary and install a symlink to the systemwide /usr/bin/phantomjs.
 cp -pr tools/phantomjs %{buildroot}%{_datadir}/%{name}/tools/
-rm %{buildroot}%{_datadir}/%{name}/tools/phantomjs/phantomjs
+rm -f %{buildroot}%{_datadir}/%{name}/tools/phantomjs/phantomjs
 ln -s %{_bindir}/phantomjs %{buildroot}%{_datadir}/%{name}/tools/phantomjs/phantomjs
 
 # Do *not* use %%fudpes -s -- this will result in grafana failing to load