- _constraints: reset aarch64 memory requirements back to original

otherwise some unit tests can fail

OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs18?expand=0&rev=38
This commit is contained in:
Adam Majer 2023-01-25 12:41:48 +00:00 committed by Git OBS Bridge
parent 27ec2a16cf
commit d2fd477a39
3 changed files with 8 additions and 4 deletions

View File

@ -16,9 +16,6 @@
<cpu> <cpu>
<flag>asimdrdm</flag> <flag>asimdrdm</flag>
</cpu> </cpu>
<physicalmemory>
<size unit="G">6</size>
</physicalmemory>
</hardware> </hardware>
</overwrite> </overwrite>
<overwrite> <overwrite>

View File

@ -2,6 +2,8 @@
Wed Jan 25 12:01:18 UTC 2023 - Adam Majer <adam.majer@suse.de> Wed Jan 25 12:01:18 UTC 2023 - Adam Majer <adam.majer@suse.de>
- Again use openssl-3, if available. - 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 <adam.majer@suse.de> Mon Jan 16 14:57:58 UTC 2023 - Adam Majer <adam.majer@suse.de>

View File

@ -264,6 +264,7 @@ BuildRequires: user(nobody)
BuildRequires: group(nobody) BuildRequires: group(nobody)
%endif %endif
# shared openssl
%if ! 0%{with intree_openssl} %if ! 0%{with intree_openssl}
BuildRequires: pkgconfig(openssl) >= %{openssl_req_ver} BuildRequires: pkgconfig(openssl) >= %{openssl_req_ver}
@ -277,13 +278,14 @@ 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
BuildRequires: 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' } %if %{pkg_vcmp pkgconfig(openssl) > '3.0' }
BuildRequires: libopenssl3-hmac BuildRequires: libopenssl3-hmac
%else %else
BuildRequires: libopenssl1_1-hmac BuildRequires: libopenssl1_1-hmac
@ -297,11 +299,14 @@ BuildRequires: openssl >= %{openssl_req_ver}
%endif %endif
%else %else
# bundled openssl
%if %node_version_number <= 12 && 0%{?suse_version} == 1315 && 0%{?sle_version} < 120400 %if %node_version_number <= 12 && 0%{?suse_version} == 1315 && 0%{?sle_version} < 120400
Provides: bundled(openssl) = 3.0.7 Provides: bundled(openssl) = 3.0.7
%else %else
BuildRequires: bundled_openssl_should_not_be_required BuildRequires: bundled_openssl_should_not_be_required
%endif %endif
# /bundled openssl
%endif %endif
%if ! 0%{with intree_cares} %if ! 0%{with intree_cares}