mirror of
https://src.fedoraproject.org/rpms/nodejs18.git
synced 2024-11-24 17:44:23 +00:00
Correct the bad merge of corepack fix
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
parent
01e00d5acc
commit
0787dcc5e4
1 changed files with 9 additions and 1 deletions
10
nodejs.spec
10
nodejs.spec
|
@ -8,7 +8,7 @@
|
|||
# This is used by both the nodejs package and the npm subpackage thar
|
||||
# has a separate version - the name is special so that rpmdev-bumpspec
|
||||
# will bump this rather than adding .1 to the end.
|
||||
%global baserelease 3
|
||||
%global baserelease 4
|
||||
|
||||
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||
|
||||
|
@ -533,6 +533,11 @@ find %{buildroot}%{_prefix}/lib/node_modules/npm \
|
|||
# The above command is a little overzealous. Add a few permissions back.
|
||||
chmod 0755 %{buildroot}%{_prefix}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js
|
||||
|
||||
# Corepack contains a number of executable"shims", including some for Windows
|
||||
# PowerShell. Drop the executable bit for those so we don't pick up an
|
||||
# automatic dependency on /usr/bin/pwsh that we cannot satisfy.
|
||||
chmod -x %{buildroot}%{_prefix}/lib/node_modules/corepack/shims/*.ps1
|
||||
|
||||
# Drop the NPM default configuration in place
|
||||
mkdir -p %{buildroot}%{_sysconfdir}
|
||||
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/npmrc
|
||||
|
@ -668,6 +673,9 @@ end
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Sep 14 2021 Stephen Gallagher <sgallagh@redhat.com> - 1:16.9.1-4
|
||||
- Correct the bad merge of corepack fix
|
||||
|
||||
* Tue Sep 14 2021 Stephen Gallagher <sgallagh@redhat.com> - 1:16.9.1-3
|
||||
- Drop auto-dependency on PowerShell introduced by corepack
|
||||
|
||||
|
|
Loading…
Reference in a new issue