diff --git a/nodejs.spec b/nodejs.spec index 6f538e2..7c21d33 100644 --- a/nodejs.spec +++ b/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 1 +%global baserelease 2 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -567,24 +567,6 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/node_modules/npm/node_modules LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}/%{_bindir}/node --icu-data-dir=%{buildroot}%{icudatadir} %{SOURCE2} -%pretrans -n npm -p --- Replace the npm man directory with a symlink --- Drop this scriptlet when F31 is EOL -path = "%{_prefix}/lib/node_modules/npm/man" -st = posix.stat(path) -if st and st.type == "directory" then - status = os.rename(path, path .. ".rpmmoved") - if not status then - suffix = 0 - while not status do - suffix = suffix + 1 - status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix) - end - os.rename(path, path .. ".rpmmoved") - end -end - - %files %{_bindir}/node %dir %{_prefix}/lib/node_modules @@ -605,6 +587,10 @@ end %doc AUTHORS CHANGELOG.md onboarding.md GOVERNANCE.md README.md %doc %{_mandir}/man1/node.1* +# corepack +%{_bindir}/corepack +%{_prefix}/lib/node_modules/corepack + %files devel %{_includedir}/node @@ -671,6 +657,9 @@ end %changelog +* Wed Feb 02 2022 Stephen Gallagher - 1:14.19.0-2 +- Package corepack properly. + * Wed Feb 02 2022 Stephen Gallagher - 1:14.19.0-1 - Update to Node.js 14.19.0 - Node.js now includes Corepack