From 0fb4b5559d4d63f077961fd5eb952ed8825b9b4cdcef8e812b318018058af955 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 7 May 2021 14:22:59 +0000 Subject: [PATCH] - Enable 32-bit arches again on latest node for TW - Set TW to nodejs16 - Set nodejs14 for SP3 as default and nodejs16 for SP4 - Provide nodejs(engine) by nodejs-common: nodejs-packaging happens to read the engines parameter from the json files and it's a nice-to-have if OBS can find out what the default nodejs engine to use. OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=39 --- nodejs-common.changes | 15 +++++++++++++++ nodejs-common.spec | 33 ++++++++++++++++----------------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/nodejs-common.changes b/nodejs-common.changes index 3b814d4..a8122f2 100644 --- a/nodejs-common.changes +++ b/nodejs-common.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu May 6 12:50:02 UTC 2021 - Adam Majer + +- Enable 32-bit arches again on latest node for TW +- Set TW to nodejs16 +- Set nodejs14 for SP3 as default and nodejs16 for SP4 + +------------------------------------------------------------------- +Thu Apr 29 09:33:20 UTC 2021 - Dominique Leuenberger + +- Provide nodejs(engine) by nodejs-common: nodejs-packaging happens + to read the engines parameter from the json files and it's a + nice-to-have if OBS can find out what the default nodejs engine + to use. + ------------------------------------------------------------------- Thu Apr 15 12:35:21 UTC 2021 - Guillaume GARDET diff --git a/nodejs-common.spec b/nodejs-common.spec index 51c7db1..d7ac546 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -25,21 +25,14 @@ # ########################################################### -%define NODEJS_LTS 14 -%define NODEJS_CURRENT 15 - -# logic for default version -# OBSOLETE ARCHES -%ifarch %ix86 %{arm} -%define default_node_ver 10 -%else - -# GENERAL SUPPORT ARCHES +%define NODEJS_LTS 16 +%define NODEJS_CURRENT 16 # SLE-12 variants %if 0%{?suse_version} < 1500 %define default_node_ver %NODEJS_LTS -%endif + +%else # TW %if 0%{?suse_version} > 1500 @@ -50,21 +43,26 @@ # SLE-15 variants, variation based on SP %if 0%{?sle_version} >= 150000 && 0%{?sle_version} < 150200 %define default_node_ver 10 -%else -%if 0%{?sle_version} < 150300 +%endif + +%if 0%{?sle_version} >= 150200 && 0%{?sle_version} < 150300 %define default_node_ver 12 -%else +%endif + +%if 0%{?sle_version} >= 150300 && 0%{?sle_version} < 150400 +%define default_node_ver 14 +%endif + +%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 150500 %define default_node_ver %NODEJS_LTS %endif + # SLE-15 variants %endif # TW %endif -# END - GENERAL ARCHES -%endif - Name: nodejs-common Version: 4.1 Release: 0 @@ -91,6 +89,7 @@ Group: Development/Languages/NodeJS Requires: nodejs%{default_node_ver} Requires: nodejs-common Provides: nodejs = %default_node_ver +Provides: nodejs(engine) = %default_node_ver %description -n nodejs-default Depends on the most current and recommended version of nodejs for