diff --git a/nodejs-common.changes b/nodejs-common.changes index e30aee0..9092d6a 100644 --- a/nodejs-common.changes +++ b/nodejs-common.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jun 9 10:35:06 UTC 2020 - Adam Majer + +- Add nodejs-default, npm-default and nodejs-devel-default subpackages + to provide latest, best supported nodejs for current architecture + and codestream. + + nodejs-default - nodejs runtime only + npm-default - if you need npm + nodejs + nodejs-devel-default - if you need npm + nodejs + compile modules + ------------------------------------------------------------------- Mon Dec 30 13:49:36 UTC 2019 - Adam Majer diff --git a/nodejs-common.spec b/nodejs-common.spec index 5545aaf..c31e91d 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -1,7 +1,7 @@ # # spec file for package nodejs-common # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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,40 @@ # ########################################################### +%define NODEJS_LTS 12 +%define NODEJS_CURRENT 14 + +# logic for default version +# OBSOLETE ARCHES +%ifarch %ix86 +%define default_node_ver 10 +%else + +# GENERAL SUPPORT ARCHES + +# SLE-12 variants +%if 0%{?suse_version} < 1500 +%define default_node_ver %NODEJS_LTS +%endif + +# TW +%if 0%{?suse_version} > 1500 +%define default_node_ver %NODEJS_CURRENT +%endif + +# SLE-15 variants, variation based on SP +%if 0%{?sle_version} >= 150000 && 0%{?sle_version} < 150200 +%define default_node_ver 10 +%endif +%if 0%{?sle_version} >= 150200 +%define default_node_ver %NODEJS_LTS +%endif + +# END - GENERAL ARCHES +%endif + Name: nodejs-common -Version: 3.0 +Version: 4.0 Release: 0 Summary: Common files for the NodeJS ecosystem License: MIT @@ -45,6 +77,36 @@ BuildRequires: gcc Common NodeJS files that allow recursive invocation of Node executable while retaining the same codestream version. +%package -n nodejs-default +Summary: Default version of nodejs +Group: Development/Languages/NodeJS +Requires: nodejs%{default_node_ver} +Requires: nodejs-common + +%description -n nodejs-default +Depends on the most current and recommended version of nodejs for +the current architecture and codestream. + +%package -n npm-default +Summary: Default version of npm +Group: Development/Languages/NodeJS +Requires: nodejs-default +Requires: npm%{default_node_ver} + +%description -n npm-default +Depends on the npm version associated with the current default +version of nodejs for the current architecture and codestream. + +%package -n nodejs-devel-default +Summary: Headers for default version of nodejs +Group: Development/Languages/NodeJS +Requires: nodejs%{default_node_ver}-devel +Requires: npm-default + +%description -n nodejs-devel-default +Depends on the most current and up-to-date version of nodejs for +the current architecture and codestream. + %prep %build cp %{S:2} . @@ -61,4 +123,10 @@ ln node %{buildroot}%{_bindir}/npx %{_bindir}/npm %{_bindir}/npx +%files -n nodejs-default + +%files -n npm-default + +%files -n nodejs-devel-default + %changelog