Merge branch 'master' into f19

2013-04-14 19:01:08 -07:00 · 2013-04-14 19:01:08 -07:00 · bf4a4604fe
commit bf4a4604fe
parent 7fd0876917 4424244633
3 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@
 /libuv-0.9.4gitdc559a5.tar.gz
 /libuv-0.10.0git5462dab.tar.gz
 /libuv-v0.10.3.tar.gz
+/libuv-v0.10.4.tar.gz
--- a/libuv.spec
+++ b/libuv.spec
@ -6,8 +6,8 @@

 Name: libuv
 Epoch:   1
-Version: 0.10.3
-Release: 2%{?dist}
+Version: 0.10.4
+Release: 1%{?dist}
 Summary: Platform layer for node.js

 Group: Development/Tools
@ -118,6 +118,9 @@ sed -e "s#@prefix@#%{_prefix}#g" \
 %{_includedir}/uv-private

 %changelog
+* Mon Apr 15 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.4-1
+- new upstream release 0.10.4
+
 * Thu Apr 04 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.3-2
 - backport patch that fixes FTBFS in nodejs-0.10.3

--- a/2
+++ b/2
@ -1,2 +1,2 @@
-bcd4997a3e323f448c16f2f70ba3fe1b  libuv-0.10.0git5462dab.tar.gz
 fb20265511ebb7f0785f83c60a650324  libuv-v0.10.3.tar.gz
+46f051294885ffcec502d21958d92bbb  libuv-v0.10.4.tar.gz