diff --git a/_constraints b/_constraints index fd0fd96..16f8e04 100644 --- a/_constraints +++ b/_constraints @@ -16,9 +16,6 @@ asimdrdm - - 6 - diff --git a/nodejs18.changes b/nodejs18.changes index 340a1e3..d372b5f 100644 --- a/nodejs18.changes +++ b/nodejs18.changes @@ -2,6 +2,8 @@ Wed Jan 25 12:01:18 UTC 2023 - Adam Majer - Again use openssl-3, if available. +- _constraints: reset aarch64 memory requirements back to original + otherwise some unit tests can fail ------------------------------------------------------------------- Mon Jan 16 14:57:58 UTC 2023 - Adam Majer diff --git a/nodejs18.spec b/nodejs18.spec index 8f3f37c..27356fc 100644 --- a/nodejs18.spec +++ b/nodejs18.spec @@ -264,6 +264,7 @@ BuildRequires: user(nobody) BuildRequires: group(nobody) %endif +# shared openssl %if ! 0%{with intree_openssl} BuildRequires: pkgconfig(openssl) >= %{openssl_req_ver} @@ -277,13 +278,14 @@ Requires: openssl-has-RSA_get0_pss_params %endif %if 0%{?suse_version} + %if 0%{?suse_version} >= 1500 BuildRequires: openssl >= %{openssl_req_ver} %else BuildRequires: openssl-1_1 >= %{openssl_req_ver} %endif -%if %{pkg_vcmp openssl > '3.0' } +%if %{pkg_vcmp pkgconfig(openssl) > '3.0' } BuildRequires: libopenssl3-hmac %else BuildRequires: libopenssl1_1-hmac @@ -297,11 +299,14 @@ BuildRequires: openssl >= %{openssl_req_ver} %endif %else +# bundled openssl %if %node_version_number <= 12 && 0%{?suse_version} == 1315 && 0%{?sle_version} < 120400 Provides: bundled(openssl) = 3.0.7 %else BuildRequires: bundled_openssl_should_not_be_required %endif + +# /bundled openssl %endif %if ! 0%{with intree_cares}