From c320abbbe6c3f952722329d2f769d4855f61956b Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 1 Feb 2023 10:04:37 +0000 Subject: [PATCH 1/2] - Do not use pkg_vcmp to decide BuildDependencies: this works based on 'installed packages' which is not interpreted correctly by the scheduler. Rather switch to boolean dependencies. ------------------------------------------------------------------ OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs18?expand=0&rev=44 --- nodejs18.changes | 7 +++++++ nodejs18.spec | 7 ++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/nodejs18.changes b/nodejs18.changes index 16b94ca..e52e972 100644 --- a/nodejs18.changes +++ b/nodejs18.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 1 07:58:26 UTC 2023 - Dominique Leuenberger + +- Do not use pkg_vcmp to decide BuildDependencies: this works based + on 'installed packages' which is not interpreted correctly by the + scheduler. Rather switch to boolean dependencies. + +------------------------------------------------------------------ Wed Jan 25 12:01:18 UTC 2023 - Adam Majer - Again use openssl-3, if available. diff --git a/nodejs18.spec b/nodejs18.spec index 489fa34..021d516 100644 --- a/nodejs18.spec +++ b/nodejs18.spec @@ -286,11 +286,8 @@ BuildRequires: openssl >= %{openssl_req_ver} BuildRequires: openssl-1_1 >= %{openssl_req_ver} %endif -%if %{pkg_vcmp pkgconfig(openssl) > '3.0' } -BuildRequires: libopenssl3-hmac -%else -BuildRequires: libopenssl1_1-hmac -%endif +BuildRequires: (libopenssl1_1-hmac if libopenssl-1_1-devel) +BuildRequires: (libopenssl3-hmac if libopenssl-3-devel) # /suse_version %endif From 020700894be24882e32507f63e993cf5174e61ea Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 1 Feb 2023 10:50:49 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs18?expand=0&rev=45 --- nodejs18.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nodejs18.spec b/nodejs18.spec index 021d516..f9c4cc1 100644 --- a/nodejs18.spec +++ b/nodejs18.spec @@ -282,12 +282,13 @@ Requires: openssl-has-RSA_get0_pss_params %if 0%{?suse_version} >= 1500 BuildRequires: openssl >= %{openssl_req_ver} -%else -BuildRequires: openssl-1_1 >= %{openssl_req_ver} -%endif - BuildRequires: (libopenssl1_1-hmac if libopenssl-1_1-devel) BuildRequires: (libopenssl3-hmac if libopenssl-3-devel) +%else +BuildRequires: openssl-1_1 >= %{openssl_req_ver} +BuildRequires: libopenssl1_1-hmac +%endif + # /suse_version %endif