From b812eb557514df73ab12934e5db2578de2d575d31d1130f7befe015bab6e4827 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 5 Feb 2021 15:16:15 +0000 Subject: [PATCH 1/2] - set nodejs14 as default for sle15-sp3+ - set nodejs15 as default for TW OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=25 --- nodejs-common.changes | 6 ++++++ nodejs-common.spec | 17 +++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/nodejs-common.changes b/nodejs-common.changes index 9092d6a..1bbbd2b 100644 --- a/nodejs-common.changes +++ b/nodejs-common.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 19 11:33:38 UTC 2021 - Adam Majer + +- set nodejs14 as default for sle15-sp3+ +- set nodejs15 as default for TW + ------------------------------------------------------------------- Tue Jun 9 10:35:06 UTC 2020 - Adam Majer diff --git a/nodejs-common.spec b/nodejs-common.spec index c31e91d..d417793 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -1,7 +1,7 @@ # # spec file for package nodejs-common # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,8 +25,8 @@ # ########################################################### -%define NODEJS_LTS 12 -%define NODEJS_CURRENT 14 +%define NODEJS_LTS 14 +%define NODEJS_CURRENT 15 # logic for default version # OBSOLETE ARCHES @@ -49,9 +49,12 @@ # 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 +%define default_node_ver 12 +%else +%define default_node_ver NODEJS_LTS %endif -%if 0%{?sle_version} >= 150200 -%define default_node_ver %NODEJS_LTS %endif # END - GENERAL ARCHES @@ -63,7 +66,7 @@ Release: 0 Summary: Common files for the NodeJS ecosystem License: MIT Group: Development/Languages/NodeJS -Url: https://github.com/AdamMajer/nodejs-packaging +URL: https://github.com/AdamMajer/nodejs-packaging Source1: node.c Source2: LICENSE Requires: nodejs @@ -112,6 +115,8 @@ the current architecture and codestream. cp %{S:2} . gcc ${RPM_OPT_FLAGS} -o node %{S:1} +echo "Default Node version: " %{default_node_ver} + %install install -D -m 0755 node %{buildroot}%{_bindir}/node ln node %{buildroot}%{_bindir}/npm From bf7803d5d901dbb87fe236dedddab83484fe61ae4add16bb7f05f9c697bc6dad Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 5 Feb 2021 15:24:41 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=26 --- nodejs-common.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nodejs-common.spec b/nodejs-common.spec index d417793..81de921 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -44,7 +44,8 @@ # TW %if 0%{?suse_version} > 1500 %define default_node_ver %NODEJS_CURRENT -%endif + +%else # SLE-15 variants, variation based on SP %if 0%{?sle_version} >= 150000 && 0%{?sle_version} < 150200 @@ -55,6 +56,10 @@ %else %define default_node_ver NODEJS_LTS %endif +# SLE-15 variants +%endif + +# TW %endif # END - GENERAL ARCHES