From e5a84923e4cfb869e945eb7a280b32aff563e0a26c50071b98c01d6a5b4f12f7 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 7 Jan 2020 17:00:24 +0000 Subject: [PATCH 1/5] Syncing ARM fixes OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=19 --- nodejs-common.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs-common.spec b/nodejs-common.spec index 5545aaf..20255fb 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 LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 0f92cc976cf5bde7f55ae39b045ca244c75c5c77d1948cdd886c075225b4a413 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 9 Jun 2020 10:43:01 +0000 Subject: [PATCH 2/5] - Add nodejs-default subpackage to provide latest, best supported nodejs for current architecture and codestream OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=20 --- nodejs-common.changes | 6 ++++++ nodejs-common.spec | 44 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/nodejs-common.changes b/nodejs-common.changes index e30aee0..9456fd7 100644 --- a/nodejs-common.changes +++ b/nodejs-common.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 9 10:35:06 UTC 2020 - Adam Majer + +- Add nodejs-default subpackage to provide latest, best supported + nodejs for current architecture and codestream + ------------------------------------------------------------------- Mon Dec 30 13:49:36 UTC 2019 - Adam Majer diff --git a/nodejs-common.spec b/nodejs-common.spec index 20255fb..d82bc54 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -1,7 +1,7 @@ # # spec file for package nodejs-common # -# Copyright (c) 2020 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,11 @@ # ########################################################### +%define NODEJS_LTS 12 +%define NODEJS_CURRENT 14 + Name: nodejs-common -Version: 3.0 +Version: 4.0 Release: 0 Summary: Common files for the NodeJS ecosystem License: MIT @@ -45,6 +48,43 @@ BuildRequires: gcc Common NodeJS files that allow recursive invocation of Node executable while retaining the same codestream version. +%package -n nodejs-default +Summary: Deault version of nodejs +Group: Development/Languages/NodeJS +Requires: nodejs-common + +# OBSOLETE ARCHES +%ifarch %ix86 +Requires: nodejs10 +%else + +# GENERAL SUPPORT ARCHES + +# SLE-12 variants +%if 0%{suse_version} < 1500 +Requires: nodejs%{NODEJS_LTS} +%endif + +# TW +%if 0%{suse_version} > 1500 +Requires: nodejs%{NODEJS_CURRENT} +%endif + +# SLE-15 variants, variation based on SP +%if 0%{sle_version} >= 150000 && 0%{sle_version} < 150200 +Requires: nodejs10 +%endif +%if 0%{sle_version} >= 150200 +Requires: nodejs%{NODEJS_LTS} +%endif + +# END - GENERAL ARCHES +%endif + +%description -n nodejs-default +Depends on the most current and up-to-date version of nodejs for +the current architecture and codestream. + %prep %build cp %{S:2} . From 7d2a9979c01dec014b6b0438d1ff111bf4f7a671e020527ce8c0c68459c824d5 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 9 Jun 2020 10:44:38 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=21 --- nodejs-common.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nodejs-common.spec b/nodejs-common.spec index d82bc54..4f25348 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -101,4 +101,6 @@ ln node %{buildroot}%{_bindir}/npx %{_bindir}/npm %{_bindir}/npx +%files -n nodejs-default + %changelog From 6497ad355269cdeb6e9be8bb91f7ed4d4801d5a3d0871adff49c9d14b2b42752 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 9 Jun 2020 10:50:16 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=22 --- nodejs-common.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs-common.spec b/nodejs-common.spec index 4f25348..af4c368 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -61,20 +61,20 @@ Requires: nodejs10 # GENERAL SUPPORT ARCHES # SLE-12 variants -%if 0%{suse_version} < 1500 +%if 0%{?suse_version} < 1500 Requires: nodejs%{NODEJS_LTS} %endif # TW -%if 0%{suse_version} > 1500 +%if 0%{?suse_version} > 1500 Requires: nodejs%{NODEJS_CURRENT} %endif # SLE-15 variants, variation based on SP -%if 0%{sle_version} >= 150000 && 0%{sle_version} < 150200 +%if 0%{?sle_version} >= 150000 && 0%{?sle_version} < 150200 Requires: nodejs10 %endif -%if 0%{sle_version} >= 150200 +%if 0%{?sle_version} >= 150200 Requires: nodejs%{NODEJS_LTS} %endif From 5dafee70fb6ba1e32599ef9be3db0689679f654327610af9167d00cdfa02db02 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 9 Jun 2020 11:19:22 +0000 Subject: [PATCH 5/5] - 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 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=23 --- nodejs-common.changes | 9 +++-- nodejs-common.spec | 84 ++++++++++++++++++++++++++++--------------- 2 files changed, 62 insertions(+), 31 deletions(-) diff --git a/nodejs-common.changes b/nodejs-common.changes index 9456fd7..9092d6a 100644 --- a/nodejs-common.changes +++ b/nodejs-common.changes @@ -1,8 +1,13 @@ ------------------------------------------------------------------- Tue Jun 9 10:35:06 UTC 2020 - Adam Majer -- Add nodejs-default subpackage to provide latest, best supported - nodejs for current architecture and codestream +- 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 af4c368..c31e91d 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -28,6 +28,35 @@ %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: 4.0 Release: 0 @@ -49,39 +78,32 @@ Common NodeJS files that allow recursive invocation of Node executable while retaining the same codestream version. %package -n nodejs-default -Summary: Deault version of nodejs +Summary: Default version of nodejs Group: Development/Languages/NodeJS +Requires: nodejs%{default_node_ver} Requires: nodejs-common -# OBSOLETE ARCHES -%ifarch %ix86 -Requires: nodejs10 -%else - -# GENERAL SUPPORT ARCHES - -# SLE-12 variants -%if 0%{?suse_version} < 1500 -Requires: nodejs%{NODEJS_LTS} -%endif - -# TW -%if 0%{?suse_version} > 1500 -Requires: nodejs%{NODEJS_CURRENT} -%endif - -# SLE-15 variants, variation based on SP -%if 0%{?sle_version} >= 150000 && 0%{?sle_version} < 150200 -Requires: nodejs10 -%endif -%if 0%{?sle_version} >= 150200 -Requires: nodejs%{NODEJS_LTS} -%endif - -# END - GENERAL ARCHES -%endif - %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. @@ -103,4 +125,8 @@ ln node %{buildroot}%{_bindir}/npx %files -n nodejs-default +%files -n npm-default + +%files -n nodejs-devel-default + %changelog