Merge branch 'f20' into f21

Conflicts:
	nodejs.spec
This commit is contained in:
T.C. Hollingsworth 2014-09-17 20:36:01 -07:00
commit 7e55d55276
3 changed files with 9 additions and 2 deletions

1
.gitignore vendored
View File

@ -29,3 +29,4 @@
/node-v0.10.28-stripped.tar.gz /node-v0.10.28-stripped.tar.gz
/node-v0.10.29-stripped.tar.gz /node-v0.10.29-stripped.tar.gz
/node-v0.10.30-stripped.tar.gz /node-v0.10.30-stripped.tar.gz
/node-v0.10.32-stripped.tar.gz

View File

@ -1,6 +1,6 @@
Name: nodejs Name: nodejs
Version: 0.10.30 Version: 0.10.32
Release: 2%{?dist} Release: 1%{?dist}
Summary: JavaScript runtime Summary: JavaScript runtime
License: MIT and ASL 2.0 and ISC and BSD License: MIT and ASL 2.0 and ISC and BSD
Group: Development/Languages Group: Development/Languages
@ -190,6 +190,11 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
%{_pkgdocdir}/html %{_pkgdocdir}/html
%changelog %changelog
* Thu Sep 18 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.32-1
- new upstream release 0.10.32
http://blog.nodejs.org/2014/08/19/node-v0-10-31-stable/
http://blog.nodejs.org/2014/09/16/node-v0-10-32-stable/
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.30-2 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.30-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

View File

@ -1 +1,2 @@
69074384366b4bc8ccc25e8c434b6817 node-v0.10.30-stripped.tar.gz 69074384366b4bc8ccc25e8c434b6817 node-v0.10.30-stripped.tar.gz
7e508cec9f98e41d2bcf1631795d33ee node-v0.10.32-stripped.tar.gz