Merge branch 'master' into epel7

This commit is contained in:
Stephen Gallagher 2016-10-18 15:24:43 -04:00
commit 64c064c3b6
No known key found for this signature in database
GPG Key ID: 7A25556236BAA3A3
3 changed files with 9 additions and 4 deletions

1
.gitignore vendored
View File

@ -59,3 +59,4 @@
/node-v6.7.0-stripped.tar.gz /node-v6.7.0-stripped.tar.gz
/node-v6.8.0-stripped.tar.gz /node-v6.8.0-stripped.tar.gz
/node-v6.8.1-stripped.tar.gz /node-v6.8.1-stripped.tar.gz
/node-v6.9.0-stripped.tar.gz

View File

@ -15,11 +15,11 @@
# than a Fedora release lifecycle. # than a Fedora release lifecycle.
%global nodejs_epoch 1 %global nodejs_epoch 1
%global nodejs_major 6 %global nodejs_major 6
%global nodejs_minor 8 %global nodejs_minor 9
%global nodejs_patch 1 %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 5 %global nodejs_release 1
# == Bundled Dependency Versions == # == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h # v8 - from deps/v8/include/v8-version.h
@ -403,6 +403,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc %{_pkgdocdir}/npm/doc
%changelog %changelog
* Tue Oct 18 2016 Stephen Gallagher <sgallagh@redhat.com> - -
- Update to 6.9.0 LTS release
- https://nodejs.org/en/blog/release/v6.9.0/
* Mon Oct 17 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.8.1-5 * Mon Oct 17 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.8.1-5
- Add dist tag to npm nodejs dependency - Add dist tag to npm nodejs dependency

View File

@ -1 +1 @@
cb4ac4b6882ddb53fb938c0f914c3877 node-v6.8.1-stripped.tar.gz 51582a2b398074662d49630879a9f6a3 node-v6.9.0-stripped.tar.gz