Merge branch '10'

This commit is contained in:
Stephen Gallagher 2018-07-19 20:51:07 -04:00
commit a74514f550
No known key found for this signature in database
GPG key ID: 7A25556236BAA3A3

View file

@ -27,7 +27,7 @@
%global nodejs_patch 0 %global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
%global nodejs_release 1 %global nodejs_release 2
# == Bundled Dependency Versions == # == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h # v8 - from deps/v8/include/v8-version.h
@ -419,16 +419,18 @@ rm -f %{buildroot}/%{_defaultdocdir}/node/lldb_commands.py \
NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/node_modules/npm/node_modules %{buildroot}/%{_bindir}/node -e "require(\"assert\").equal(require(\"npm\").version, '%{npm_version}')" NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/node_modules/npm/node_modules %{buildroot}/%{_bindir}/node -e "require(\"assert\").equal(require(\"npm\").version, '%{npm_version}')"
%pretrans -p <lua> %pretrans -n npm -p <lua>
-- Remove all of the symlinks from the bundled npm node_modules directory -- Remove all of the symlinks from the bundled npm node_modules directory
-- This scriptlet can be removed in Fedora 31 -- This scriptlet can be removed in Fedora 31
for f in posix.files("%{_prefix}/lib/node_modules/npm/node_modules/") do for f in posix.files("%{_prefix}/lib/node_modules/npm/node_modules/") do
st = posix.stat(f) path = "%{_prefix}/lib/node_modules/npm/node_modules/"..f
st = posix.stat(path)
if st and st.type == "link" then if st and st.type == "link" then
os.remove(path) os.remove(path)
end end
end end
%files %files
%{_bindir}/node %{_bindir}/node
%dir %{_prefix}/lib/node_modules %dir %{_prefix}/lib/node_modules