Skip to content

Commit 9805dea

Browse files
CBL-Mariner-BotsandeepkarambelkarCopilotjslobodzian
authored
[AUTO-CHERRYPICK] Fix npm coexistence with respective nodejs versions - branch 3.0-dev (microsoft#15836)
Co-authored-by: Sandeep Karambelkar <skarambelkar@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: jslobodzian <joslobo@microsoft.com>
1 parent 5627d4f commit 9805dea

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

SPECS/nodejs24/nodejs24.spec

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Name: nodejs24
1616
# WARNINGS: MUST check and update the 'npm_version' macro for every version update of this package.
1717
# The version of NPM can be found inside the sources under 'deps/npm/package.json'.
1818
Version: 24.13.0
19-
Release: 2%{?dist}
19+
Release: 3%{?dist}
2020
License: BSD AND MIT AND Public Domain AND NAIST-2003 AND Artistic-2.0
2121
Vendor: Microsoft Corporation
2222
Distribution: Azure Linux
@@ -87,7 +87,9 @@ package to save space if non-English locales are not needed.
8787
Summary: Node.js Package Manager
8888
Group: System Environment/Base
8989
Requires: %{name} = %{version}-%{release}
90-
Provides: npm = %{npm_version}.%{version}-%{release}
90+
Provides: nodejs24-npm = %{version}-%{release}
91+
Obsoletes: nodejs24-npm < %{version}-%{release}
92+
Conflicts: npm
9193

9294
%description npm
9395
npm is a package manager for node.js. You can use it to install and publish
@@ -123,7 +125,7 @@ python3 configure.py \
123125
--openssl-use-def-ca-store \
124126
--shared-cares
125127

126-
JOBS=4 make %{?_smp_mflags} V=0
128+
JOBS=%{_smp_build_ncpus} make %{?_smp_mflags} V=0
127129

128130
%install
129131

@@ -178,9 +180,13 @@ make cctest
178180
%{_prefix}/lib/node_modules/*
179181

180182
%changelog
181-
* Tue Feb 03 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 24.13.0-2
183+
* Fri Feb 13 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 24.13.0-3
182184
- Patch for CVE-2025-69418
183185

186+
* Tue Feb 10 2026 Sandeep Karambelkar <skarambelkar@microsoft.com> - 24.13.0-2
187+
- Add conflicts for legacy npm package
188+
- Update provided capability from npm to nodejs24-npm
189+
184190
* Tue Dec 23 2025 Sandeep Karambelkar <skarambelkar@microsoft.com> - 24.13.0-1
185191
- Upgrade to 24.13.0
186192
- Add support for passing runtime internationalization data

0 commit comments

Comments
 (0)