From bcd376029b8d0a8cf4df432c5dc8b601a248403214254885d632a523966a44c4 Mon Sep 17 00:00:00 2001
From: Joao Cavalheiro <jcavalheiro@suse.com>
Date: Mon, 20 May 2019 13:51:44 +0000
Subject: [PATCH] Accepting request 703969 from
 home:dirkmueller:branches:server:monitoring

- Update to version 6.1.6 (bsc#1115960, CVE-2018-19039):
  See https://community.grafana.com/t/release-notes-v6-1-x/15772
  Security: Bump jQuery to 3.4.0
  File Exfiltration vulnerability Security fix

- Update to version 6.0.2:
  * Fixed issue with alert links in alert list panel causing panel not found errors, fixes #15680
  * Improved error handling when rendering dashboard panels, fixes #15913
  * fix allow anonymous server bind for ldap search
  * add nil/length check when delete old login attempts
  * fix discord notifier so it doesn't crash when there are no image generated
  * fix only users that can edit a dashboard should be able to update panel json
  * move to new component to handle focus
  * added state to not set focus on search every render
  * Snapshots update
  * Use app config directly in ButtonRow instead of passing datasources page URL via prop
  * Update snapshots
  * Fixed url of back button in datasource edit page, when root_url configured
  * release: Bumped version

OBS-URL: https://build.opensuse.org/request/show/703969
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=12
---
 _service             |  4 ++--
 _servicedata         |  2 +-
 grafana-6.0.1.tar.xz |  3 ---
 grafana-6.1.6.tar.xz |  3 +++
 grafana.changes      | 25 +++++++++++++++++++++++++
 grafana.spec         |  2 +-
 6 files changed, 32 insertions(+), 7 deletions(-)
 delete mode 100644 grafana-6.0.1.tar.xz
 create mode 100644 grafana-6.1.6.tar.xz

diff --git a/_service b/_service
index bd0fade..550f668 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">6.0.1</param>
-    <param name="revision">v6.0.1</param>
+    <param name="versionformat">6.1.6</param>
+    <param name="revision">v6.1.6</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="disabled">
diff --git a/_servicedata b/_servicedata
index 5c00f47..c76c79f 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">ae4bdf940396b0d953cfd39f6bc6e019debde986</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">44c5c0e0a67f1e3ac70608f6c8f55c56375a4279</param></service></servicedata>
\ No newline at end of file
diff --git a/grafana-6.0.1.tar.xz b/grafana-6.0.1.tar.xz
deleted file mode 100644
index b4fa468..0000000
--- a/grafana-6.0.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79f321a066afc83b4e0f860d658241c3698027bc6ee761bdf3a9cc4eb9b90940
-size 34006608
diff --git a/grafana-6.1.6.tar.xz b/grafana-6.1.6.tar.xz
new file mode 100644
index 0000000..5d1b10a
--- /dev/null
+++ b/grafana-6.1.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9c50af0ff76f70a4994ad45a9131ec5be6bd9b70613fd6f467ff70966625d53
+size 34073416
diff --git a/grafana.changes b/grafana.changes
index bd91856..ec05278 100644
--- a/grafana.changes
+++ b/grafana.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Sat May 18 18:05:38 UTC 2019 - dmueller@suse.com
+
+- Update to version 6.1.6 (bsc#1115960, CVE-2018-19039):
+  See https://community.grafana.com/t/release-notes-v6-1-x/15772
+  Security: Bump jQuery to 3.4.0
+  File Exfiltration vulnerability Security fix
+
+-------------------------------------------------------------------
+Sat May 18 14:01:07 UTC 2019 - dmueller@suse.com
+
+- Update to version 6.0.2:
+  * Fixed issue with alert links in alert list panel causing panel not found errors, fixes #15680
+  * Improved error handling when rendering dashboard panels, fixes #15913
+  * fix allow anonymous server bind for ldap search
+  * add nil/length check when delete old login attempts
+  * fix discord notifier so it doesn't crash when there are no image generated
+  * fix only users that can edit a dashboard should be able to update panel json
+  * move to new component to handle focus
+  * added state to not set focus on search every render
+  * Snapshots update
+  * Use app config directly in ButtonRow instead of passing datasources page URL via prop
+  * Update snapshots
+  * Fixed url of back button in datasource edit page, when root_url configured
+  * release: Bumped version
 
 -------------------------------------------------------------------
 Mon Mar 11 11:17:39 UTC 2019 - jan.fajerski@suse.com
diff --git a/grafana.spec b/grafana.spec
index ca6fdee..6ccd8ee 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:           grafana
-Version:        6.0.1
+Version:        6.1.6
 Release:        0
 Summary:        Dashboards and editors for Graphite, InfluxDB, OpenTSDB
 License:        Apache-2.0