From 36c9cfe3b308c3225d722e38c79eb4409a04d4de Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Wed, 31 Jan 2018 20:45:05 +0100
Subject: [PATCH] upgrading package: grafana 2.5.0.20151028 -> 4.6.3.20180131

---
 grafana/grafana.spec | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/grafana/grafana.spec b/grafana/grafana.spec
index c7696307d2..896b51cf07 100644
--- a/grafana/grafana.spec
+++ b/grafana/grafana.spec
@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_grafana_base 2.5.0
-%define       V_grafana_snap 20151028
+%define       V_grafana_base 4.6.3
+%define       V_grafana_snap 20180131
 
 #   package information
 Name:         grafana
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Web
 License:      Apache
 Version:      %{V_grafana_base}.%{V_grafana_snap}
-Release:      20151028
+Release:      20180131
 
 #   list of sources
 Source0:      http://download.openpkg.org/components/versioned/grafana/grafana-%{V_grafana_snap}.tar.xz
@@ -50,14 +50,14 @@ PreReq:       OpenPKG, openpkg >= 20160101
 
 %description
     Grafana is an open source, feature rich metrics dashboard and graph
-    editor for the statistic storage databases Graphite, InfluxDB and
-    OpenTSDB.
+    editor for the statistic storage databases Graphite, ElasticSearch,
+    OpenTSDB, Prometheus and InfluxDB.
 
 %track
     prog grafana = {
         version   = %{V_grafana_base}
-        url       = http://grafana.org/download/
-        regex     = grafana-(\d+\.\d+(?:\.\d+)*)\.tar\.gz
+        url       = https://grafana.com/grafana/download
+        regex     = grafana-(\d+\.\d+(?:\.\d+)*)\.
     }
 
 %prep
@@ -72,12 +72,13 @@ PreReq:       OpenPKG, openpkg >= 20160101
     #   build program
     (   export GOPATH=`pwd`
         cd src/github.com/grafana/grafana
-        go build -x -o grafana .
+        go run build.go build
     ) || exit $?
 
 %install
     #   create installation hierarchy
     %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/bin \
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
         $RPM_BUILD_ROOT%{l_prefix}/etc/grafana \
@@ -92,8 +93,11 @@ PreReq:       OpenPKG, openpkg >= 20160101
 
     #   install backend program
     %{l_shtool} install -c -m 755 \
-        src/github.com/grafana/grafana/grafana \
+        src/github.com/grafana/grafana/bin/grafana-server \
         $RPM_BUILD_ROOT%{l_prefix}/sbin/
+    %{l_shtool} install -c -m 755 \
+        src/github.com/grafana/grafana/bin/grafana-cli \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/
 
     #   install default configuration
     %{l_shtool} install -c -m 644 %{l_value -s -a} \