Merge branch 'f19' into f20

Conflicts: nodejs.spec
2014-02-19 21:01:43 -07:00 · 2014-02-19 21:01:43 -07:00 · c7d9c59d37
commit c7d9c59d37
parent 337d16703b 1e46137691
3 changed files with 8 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,3 +25,4 @@
 /node-v0.10.24.tar.gz
 /node-v0.10.24-stripped.tar.gz
 /node-v0.10.25-stripped.tar.gz
+/node-v0.10.26-stripped.tar.gz
--- a/nodejs.spec
+++ b/nodejs.spec
@ -1,6 +1,6 @@
 Name: nodejs
-Version: 0.10.25
-Release: 2%{?dist}
+Version: 0.10.26
+Release: 1%{?dist}
 Summary: JavaScript runtime
 License: MIT and ASL 2.0 and ISC and BSD
 Group: Development/Languages
@ -166,6 +166,10 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
 %{_pkgdocdir}/html

 %changelog
+* Thu Feb 20 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.26-1
+- new upstream release 0.10.25
+  http://blog.nodejs.org/2014/02/18/node-v0-10-26-stable/
+
 * Fri Feb 14 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.25-2
 - rebuild for icu-53 (via v8)

--- a/2
+++ b/2
@ -1 +1 @@
-0cb686d5644944b21d1ba0dd70e106d8  node-v0.10.25-stripped.tar.gz
+ecfd516837ce3299ed3eabbb4a219f52  node-v0.10.26-stripped.tar.gz