From 67d46e73d0a8d50a1dfd69b582dc6da03cbd5dda Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Tue, 27 Jun 2023 13:46:41 +0200 Subject: [PATCH 1/2] PMM-12254 Update grafana spec to 9.2.20 --- build/packages/rpm/server/SPECS/grafana.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index c69d5051d4..9bc89aa7bd 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -2,8 +2,8 @@ %global commit f84a7c35000e11a2f4684852fd657f814381558c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define build_timestamp %(date -u +"%y%m%d%H%M") -%define release 99 -%define grafana_version 9.2.18 +%define release 100 +%define grafana_version 9.2.20 %define full_pmm_version 2.0.0 %define full_version v%{grafana_version}-%{full_pmm_version} %define rpm_release %{release}.%{build_timestamp}.%{shortcommit}%{?dist} @@ -84,6 +84,9 @@ getent passwd grafana >/dev/null || \ exit 0 %changelog +* Tue Jun 27 2023 Matej Kubinec - 9.2.20-1 +- PMM-12254 Grafana 9.2.20 + * Thu May 18 2023 Matej Kubinec - 9.2.18-1 - PMM-12114 Grafana 9.2.18 From 8a3d52f10adb3128831b0b11c0b97e9f74ded527 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Thu, 29 Jun 2023 12:52:56 +0200 Subject: [PATCH 2/2] PMM-12254 Use commit hash for Grafana 9.2.20 --- build/packages/rpm/server/SPECS/grafana.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index 9bc89aa7bd..43f815c837 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%global commit f84a7c35000e11a2f4684852fd657f814381558c +%global commit 7ff49f34a3998067fa1ea480c07e0c74939ea306 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define build_timestamp %(date -u +"%y%m%d%H%M") %define release 100