- Again use openssl-3, if available.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs18?expand=0&rev=37
This commit is contained in:
Adam Majer 2023-01-25 12:03:50 +00:00 committed by Git OBS Bridge
parent 79a8fb6293
commit 27ec2a16cf
2 changed files with 16 additions and 7 deletions

View File

@ -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> Mon Jan 16 14:57:58 UTC 2023 - Adam Majer <adam.majer@suse.de>

View File

@ -82,7 +82,7 @@ Release: 0
%define _libexecdir %{_exec_prefix}/lib %define _libexecdir %{_exec_prefix}/lib
%endif %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 %bcond_with intree_openssl
%else %else
%bcond_without intree_openssl %bcond_without intree_openssl
@ -266,8 +266,7 @@ BuildRequires: group(nobody)
%if ! 0%{with intree_openssl} %if ! 0%{with intree_openssl}
BuildRequires: libopenssl-1_1-devel BuildRequires: pkgconfig(openssl) >= %{openssl_req_ver}
#BuildRequires: (pkgconfig(openssl) >= %{openssl_req_ver} and pkgconfig(openssl) < 3.0)
# require patched openssl library on SLES for nodejs16 # require patched openssl library on SLES for nodejs16
%if 0%{?suse_version} && "%{pkg_version openssl-1_1}" != "~~~" %if 0%{?suse_version} && "%{pkg_version openssl-1_1}" != "~~~"
@ -278,13 +277,18 @@ Requires: openssl-has-RSA_get0_pss_params
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
#%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
#iBuildRequires: openssl >= %{openssl_req_ver} BuildRequires: openssl >= %{openssl_req_ver}
#%else %else
BuildRequires: openssl-1_1 >= %{openssl_req_ver} BuildRequires: openssl-1_1 >= %{openssl_req_ver}
#%endif %endif
%if %{pkg_vcmp openssl > '3.0' }
BuildRequires: libopenssl3-hmac
%else
BuildRequires: libopenssl1_1-hmac BuildRequires: libopenssl1_1-hmac
%endif
# /suse_version # /suse_version
%endif %endif