From 0e4a7754aaaf3abd4b0ea39dd95850c2e72a8b32884f5a31c0c04bc35aa042e3 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 8 Mar 2021 15:26:31 +0000 Subject: [PATCH 1/6] - Provide nodejs and npm by the correct package, instead of the legacy common package. OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=30 --- nodejs-common.changes | 5 +++-- nodejs-common.spec | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nodejs-common.changes b/nodejs-common.changes index 34c6e82..e2556bd 100644 --- a/nodejs-common.changes +++ b/nodejs-common.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Tue Feb 9 15:15:46 UTC 2021 - Adam Majer +Mon Mar 8 15:10:15 UTC 2021 - Adam Majer -- Fix typo in Requires +- Provide nodejs and npm by the correct package, instead of the + legacy common package. ------------------------------------------------------------------- Tue Jan 19 11:33:38 UTC 2021 - Adam Majer diff --git a/nodejs-common.spec b/nodejs-common.spec index 372b291..5beacb3 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -90,6 +90,7 @@ Summary: Default version of nodejs Group: Development/Languages/NodeJS Requires: nodejs%{default_node_ver} Requires: nodejs-common +Provides: nodejs = %default_node_ver %description -n nodejs-default Depends on the most current and recommended version of nodejs for @@ -100,6 +101,7 @@ Summary: Default version of npm Group: Development/Languages/NodeJS Requires: nodejs-default Requires: npm%{default_node_ver} +Provides: npm = %default_node_ver %description -n npm-default Depends on the npm version associated with the current default @@ -129,13 +131,13 @@ ln node %{buildroot}%{_bindir}/npx %files %license LICENSE -%{_bindir}/node -%{_bindir}/npm -%{_bindir}/npx %files -n nodejs-default +%{_bindir}/node %files -n npm-default +%{_bindir}/npm +%{_bindir}/npx %files -n nodejs-devel-default From c42696cb068265aae81714fdca628c2ccbed767130fbbb1822d60c113cd23dc0 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 8 Mar 2021 17:55:06 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=31 --- nodejs-common.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nodejs-common.spec b/nodejs-common.spec index 5beacb3..851469b 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -66,7 +66,7 @@ %endif Name: nodejs-common -Version: 4.0 +Version: 4.1 Release: 0 Summary: Common files for the NodeJS ecosystem License: MIT @@ -102,6 +102,8 @@ Group: Development/Languages/NodeJS Requires: nodejs-default Requires: npm%{default_node_ver} Provides: npm = %default_node_ver +Obsoletes: nodejs-default < 4.1 +Replaces: nodejs-default < 4.1 %description -n npm-default Depends on the npm version associated with the current default From c0902825390660656109a9e9d35bfd9e7d0e0fb6257fa0e85cb488912057f673 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 9 Mar 2021 14:39:59 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=32 --- nodejs-common.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs-common.spec b/nodejs-common.spec index 851469b..e4707a7 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -103,7 +103,6 @@ Requires: nodejs-default Requires: npm%{default_node_ver} Provides: npm = %default_node_ver Obsoletes: nodejs-default < 4.1 -Replaces: nodejs-default < 4.1 %description -n npm-default Depends on the npm version associated with the current default @@ -114,6 +113,7 @@ Summary: Headers for default version of nodejs Group: Development/Languages/NodeJS Requires: nodejs%{default_node_ver}-devel Requires: npm-default +Provides: nodejs-devel = %{version} %description -n nodejs-devel-default Depends on the most current and up-to-date version of nodejs for From 3022f5226a93172dd761c58056aad9c69a0d557433fda827a60d2ab8ca3176f5 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 9 Mar 2021 14:57:05 +0000 Subject: [PATCH 4/6] obsolete the correct package! OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=33 --- nodejs-common.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nodejs-common.spec b/nodejs-common.spec index e4707a7..9838d8e 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -91,6 +91,7 @@ Group: Development/Languages/NodeJS Requires: nodejs%{default_node_ver} Requires: nodejs-common Provides: nodejs = %default_node_ver +Obsoletes: nodejs-common < 4.1 %description -n nodejs-default Depends on the most current and recommended version of nodejs for @@ -102,7 +103,7 @@ Group: Development/Languages/NodeJS Requires: nodejs-default Requires: npm%{default_node_ver} Provides: npm = %default_node_ver -Obsoletes: nodejs-default < 4.1 +Obsoletes: nodejs-common < 4.1 %description -n npm-default Depends on the npm version associated with the current default From 097c92b8f9cc30101bf8c5707eb8cc691e6137c2b456df4af6b5aaa0a48a0058 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 9 Mar 2021 17:31:37 +0000 Subject: [PATCH 5/6] - Provide nodejs and npm and nodejs-devel by the appropriate defaults package OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=34 --- nodejs-common.changes | 6 +++--- nodejs-common.spec | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/nodejs-common.changes b/nodejs-common.changes index e2556bd..f869b0b 100644 --- a/nodejs-common.changes +++ b/nodejs-common.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- -Mon Mar 8 15:10:15 UTC 2021 - Adam Majer +Tue Mar 9 17:29:00 UTC 2021 - Adam Majer -- Provide nodejs and npm by the correct package, instead of the - legacy common package. +- Provide nodejs and npm and nodejs-devel by the appropriate + defaults package ------------------------------------------------------------------- Tue Jan 19 11:33:38 UTC 2021 - Adam Majer diff --git a/nodejs-common.spec b/nodejs-common.spec index 9838d8e..c6b0df8 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -91,7 +91,6 @@ Group: Development/Languages/NodeJS Requires: nodejs%{default_node_ver} Requires: nodejs-common Provides: nodejs = %default_node_ver -Obsoletes: nodejs-common < 4.1 %description -n nodejs-default Depends on the most current and recommended version of nodejs for @@ -103,7 +102,6 @@ Group: Development/Languages/NodeJS Requires: nodejs-default Requires: npm%{default_node_ver} Provides: npm = %default_node_ver -Obsoletes: nodejs-common < 4.1 %description -n npm-default Depends on the npm version associated with the current default @@ -134,14 +132,14 @@ ln node %{buildroot}%{_bindir}/npx %files %license LICENSE - -%files -n nodejs-default %{_bindir}/node - -%files -n npm-default %{_bindir}/npm %{_bindir}/npx +%files -n nodejs-default + +%files -n npm-default + %files -n nodejs-devel-default %changelog From 30b35853f997e33ec53beed4827a84ff72cb93753f9213be43f423b98a7bbb09 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 9 Mar 2021 17:36:48 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-common?expand=0&rev=35 --- nodejs-common.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs-common.spec b/nodejs-common.spec index c6b0df8..42a1edc 100644 --- a/nodejs-common.spec +++ b/nodejs-common.spec @@ -112,7 +112,7 @@ Summary: Headers for default version of nodejs Group: Development/Languages/NodeJS Requires: nodejs%{default_node_ver}-devel Requires: npm-default -Provides: nodejs-devel = %{version} +Provides: nodejs-devel = %default_node_ver %description -n nodejs-devel-default Depends on the most current and up-to-date version of nodejs for