From 5dafee70fb6ba1e32599ef9be3db0689679f654327610af9167d00cdfa02db02 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Tue, 9 Jun 2020 11:19:22 +0000
Subject: [PATCH] - 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 <adam.majer@suse.de>
 
-- 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 <adam.majer@suse.de>
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