From 0215856343c43ca6ba07f6972dd9164c792cea69 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Tue, 19 Apr 2022 14:29:40 +0200 Subject: [PATCH] remove openssl build dependency, add conditional for HMAC-SHA256 patch --- grafana.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/grafana.spec b/grafana.spec index 489313f..0cbf13e 100644 --- a/grafana.spec +++ b/grafana.spec @@ -117,9 +117,6 @@ BuildRequires: nodejs >= 1:14, yarnpkg %if %{enable_fips_mode} BuildRequires: openssl-devel - -# only required for running the FIPS test -BuildRequires: openssl %endif # omit golang debugsource, see BZ995136 and related @@ -785,7 +782,9 @@ rm -r plugins-bundled %if %{enable_fips_mode} %patch10 -p1 %endif +%if 0%{?fedora} || 0%{?rhel} > 8 %patch11 -p1 +%endif %patch12 -p1 %patch13 -p1 %patch14 -p1