From 27ec2a16cf7297caa42a17ae3c51553c4a13e669 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Wed, 25 Jan 2023 12:03:50 +0000
Subject: [PATCH] - Again use openssl-3, if available.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs18?expand=0&rev=37
---
 nodejs18.changes |  5 +++++
 nodejs18.spec    | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/nodejs18.changes b/nodejs18.changes
index b26c7fb..340a1e3 100644
--- a/nodejs18.changes
+++ b/nodejs18.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 25 12:01:18 UTC 2023 - Adam Majer <adam.majer@suse.de>
+
+- Again use openssl-3, if available.
+
 -------------------------------------------------------------------
 Mon Jan 16 14:57:58 UTC 2023 - Adam Majer <adam.majer@suse.de>
 
diff --git a/nodejs18.spec b/nodejs18.spec
index 1ff04ca..8f3f37c 100644
--- a/nodejs18.spec
+++ b/nodejs18.spec
@@ -82,7 +82,7 @@ Release:        0
 %define _libexecdir %{_exec_prefix}/lib
 %endif
 
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 120500 || 0%{?fedora_version} >= 35
+%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 120400 || 0%{?fedora_version} >= 35
 %bcond_with    intree_openssl
 %else
 %bcond_without intree_openssl
@@ -266,8 +266,7 @@ BuildRequires:  group(nobody)
 
 %if ! 0%{with intree_openssl}
 
-BuildRequires:  libopenssl-1_1-devel
-#BuildRequires:  (pkgconfig(openssl) >= %{openssl_req_ver} and pkgconfig(openssl) < 3.0)
+BuildRequires:  pkgconfig(openssl) >= %{openssl_req_ver}
 
 # require patched openssl library on SLES for nodejs16
 %if 0%{?suse_version} && "%{pkg_version openssl-1_1}" != "~~~"
@@ -278,13 +277,18 @@ Requires:       openssl-has-RSA_get0_pss_params
 %endif
 
 %if 0%{?suse_version}
-#%if 0%{?suse_version} >= 1500
-#iBuildRequires:  openssl >= %{openssl_req_ver}
-#%else
+%if 0%{?suse_version} >= 1500
+BuildRequires:  openssl >= %{openssl_req_ver}
+%else
 BuildRequires:  openssl-1_1 >= %{openssl_req_ver}
-#%endif
+%endif
 
+%if %{pkg_vcmp openssl > '3.0' }
+BuildRequires:  libopenssl3-hmac
+%else
 BuildRequires:  libopenssl1_1-hmac
+%endif
+
 # /suse_version
 %endif