Merge branch 'master' into epel7

This commit is contained in:
Stephen Gallagher 2016-09-27 21:59:24 -04:00
commit f1befb7526
No known key found for this signature in database
GPG key ID: 7A25556236BAA3A3
3 changed files with 8 additions and 3 deletions

1
.gitignore vendored
View file

@ -56,3 +56,4 @@
/node-v6.4.0-stripped.tar.gz
/node-v6.5.0-stripped.tar.gz
/node-v6.6.0-stripped.tar.gz
/node-v6.7.0-stripped.tar.gz

View file

@ -14,7 +14,7 @@
# feature releases that are only supported for nine months, which is shorter
# than a Fedora release lifecycle.
%global nodejs_major 6
%global nodejs_minor 6
%global nodejs_minor 7
%global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
@ -65,7 +65,7 @@ Name: nodejs
Epoch: 1
Version: %{nodejs_version}
# Keep this release > 100 for F25+ due to a complicated npm upgrade bug
Release: 106%{?dist}
Release: 107%{?dist}
Summary: JavaScript runtime
License: MIT and ASL 2.0 and ISC and BSD
Group: Development/Languages
@ -383,6 +383,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc
%changelog
* Tue Sep 27 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.7.0-107
- Update to 6.7.0
- https://nodejs.org/en/blog/release/v6.7.0/
* Fri Sep 16 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.6.0-106
- Drop Conflicts: from main package.
It wasn't needed and was breaking upgrades in some cases.

View file

@ -1 +1 @@
1639577a3bb818c7cdc2ca95dd8407f7 node-v6.6.0-stripped.tar.gz
0c246b5769614c71d4f2b3a6ace4a843 node-v6.7.0-stripped.tar.gz