Merge branch 'master' into epel7
This commit is contained in:
commit
86ca5c2db2
@ -19,7 +19,7 @@
|
|||||||
%global nodejs_patch 1
|
%global nodejs_patch 1
|
||||||
%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 3
|
||||||
|
|
||||||
# == Bundled Dependency Versions ==
|
# == Bundled Dependency Versions ==
|
||||||
# v8 - from deps/v8/include/v8-version.h
|
# v8 - from deps/v8/include/v8-version.h
|
||||||
@ -200,7 +200,7 @@ Development headers for the Node.js JavaScript runtime.
|
|||||||
Summary: Node.js Package Manager
|
Summary: Node.js Package Manager
|
||||||
Epoch: %{npm_epoch}
|
Epoch: %{npm_epoch}
|
||||||
Version: %{npm_version}
|
Version: %{npm_version}
|
||||||
Release: %{npm_release}
|
Release: %{npm_release}%{?dist}
|
||||||
|
|
||||||
# We used to ship npm separately, but it is so tightly integrated with Node.js
|
# We used to ship npm separately, but it is so tightly integrated with Node.js
|
||||||
# (and expected to be present on all Node.js systems) that we ship it bundled
|
# (and expected to be present on all Node.js systems) that we ship it bundled
|
||||||
@ -404,6 +404,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
|
|||||||
%{_pkgdocdir}/npm/doc
|
%{_pkgdocdir}/npm/doc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Oct 15 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.8.1-3
|
||||||
|
- Bump release version for tagging bug
|
||||||
|
|
||||||
* Sat Oct 15 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.8.1-1
|
* Sat Oct 15 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.8.1-1
|
||||||
- Update node to v6.8.0
|
- Update node to v6.8.0
|
||||||
- Fix FTBFS against non-bundled zlib
|
- Fix FTBFS against non-bundled zlib
|
||||||
|
Loading…
Reference in New Issue
Block a user