From e32df08c9a02a22d676bc8a678a319f0cfdb9554 Mon Sep 17 00:00:00 2001
From: Sam Feifer <sfeifer@redhat.com>
Date: Mon, 1 Dec 2025 15:26:17 -0500
Subject: [PATCH] Resolves: RHEL-125664

fix recursive definition of gotestflags macro
---
 grafana.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/grafana.spec b/grafana.spec
index bd83beb..0dfb3cf 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -29,13 +29,14 @@
 end}
 
 %global gomodulesmode GO111MODULE=auto
-%global gotestflags   %{gotestflags} -tags=integration
+%global _gotestflags_save %{?gotestflags}
+%global gotestflags %{?_gotestflags_save} -tags=integration
 
 %global selinux_variants mls targeted
 
 Name:             grafana
 Version:          9.2.10
-Release:          25%{?dist}
+Release:          26%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          AGPLv3
 URL:              https://grafana.org
@@ -1023,6 +1024,9 @@ fi
 %{_datadir}/selinux/*/grafana.pp
 
 %changelog
+* Mon Dec 1 2025 Sam Feifer <sfeifer@redhat.com> 9.2.10-26
+- Resolves RHEL-125664: CVE-2025-58183
+
 * Wed Jun 4 2025 Sam Feifer <sfeifer@redhat.com> 9.2.10-25
 - Resolves RHEL-89269: CVE-2025-22871