From 85f9c7a1304d86ce12da65515d517a4426b96467 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <david.abdurachmanov@sifive.com>
Date: Sun, 17 May 2020 19:14:35 +0300
Subject: [PATCH] Fix merge

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
---
 nss.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nss.spec b/nss.spec
index bd3c181..7172c3a 100644
--- a/nss.spec
+++ b/nss.spec
@@ -109,9 +109,14 @@ Patch4:           iquote.patch
 Patch12:          nss-signtool-format.patch
 # https://github.com/FStarLang/kremlin/issues/166
 Patch13:          nss-kremlin-ppc64le.patch
+%if 0%{?fedora} < 34
+%if 0%{?rhel} < 9
+Patch20:          nss-gcm-param-default-pkcs11v2.patch
+%endif
+%endif
 
 # Fix RISC-V compilation
-Patch20:          nss-3.50-fix-riscv64.patch
+Patch30:          nss-3.50-fix-riscv64.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to