0.10.5 (2013.04.24)

diff --git a/0001-unix-include-uv.h-in-src-version.c.patch b/0001-unix-include-uv.h-in-src-version.c.patch
deleted file mode 100644 (file)
index a2e9792..0000000
--- a/0001-unix-include-uv.h-in-src-version.c.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fb660262d4f8b6d0f300a3923063ec5a718411ad Mon Sep 17 00:00:00 2001
-From: Ben Noordhuis <info@bnoordhuis.nl>
-Date: Thu, 4 Apr 2013 03:02:06 +0200
-Subject: [PATCH] unix: include uv.h in src/version.c
-
-Include uv.h so the compiler sees the right visibility attribute for
-uv_version() and uv_version_string().
-
-GYP builds compile with -fvisibility=hidden. Before this commit, the
-symbols were not visible in libuv.so.
-
-Fixes joyent/node#5213.
-(cherry picked from commit f1215b791811e5c860152ecde038f35537dab57f)
----
- src/version.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/version.c b/src/version.c
-index 0ee0753..7326180 100644
---- a/src/version.c
-+++ b/src/version.c
-@@ -19,6 +19,7 @@
-  * IN THE SOFTWARE.
-  */
- 
-+#include "uv.h"
- 
-  /*
-  * Versions with an even minor version (e.g. 0.6.1 or 1.0.4) are API and ABI
-@@ -26,6 +27,9 @@
-  * releases.
-  */
- 
-+#undef UV_VERSION_MAJOR   /* TODO(bnoordhuis) Remove in v0.11. */
-+#undef UV_VERSION_MINOR   /* TODO(bnoordhuis) Remove in v0.11. */
-+
- #define UV_VERSION_MAJOR 0
- #define UV_VERSION_MINOR 10
- #define UV_VERSION_PATCH 3
--- 
-1.8.1.4
-

diff --git a/libuv.spec b/libuv.spec
index 87872622af61b624bc4594977f502e9c1d4d4eba..be6faefe00424d914bd681435076ca52993b0839 100644 (file)
--- a/libuv.spec
+++ b/libuv.spec
@@ -1,23 +1,22 @@
-%define git_snapshot 5462dab
+#
+# Conditional build:
+%bcond_with    tests           # build with tests (require network access)
+
+# git log -1 --pretty=format:%h v0.10.5
+%define git_snapshot 6595a77
 Summary:       Platform layer for node.js
 Name:          libuv
-Version:       0.10.3
+Version:       0.10.5
 Release:       1
 License:       MIT
 Group:         Development/Tools
 URL:           http://nodejs.org/
 Source0:       http://libuv.org/dist/v%{version}/%{name}-v%{version}.tar.gz
-# Source0-md5: fb20265511ebb7f0785f83c60a650324
+# Source0-md5: 169e4d299e791b733892bc1c04b2b6b9
 Source2:       %{name}.pc.in
-# backport fix to FTBFS in nodejs-0.10.3
-# https://github.com/joyent/node/issues/5213
-Patch0001:     0001-unix-include-uv.h-in-src-version.c.patch
 BuildRequires: libstdc++-devel
 BuildRequires: pkgconfig
 BuildRequires: python-gyp
-# Bundling exception request:
-# https://fedorahosted.org/fpc/ticket/231
-Provides:      bundled(libev) = 4.04
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # we only need major.minor in the SONAME in the stable (even numbered) series
@@ -39,7 +38,6 @@ Development libraries for libuv
 
 %prep
 %setup -q -n %{name}-v%{version}
-%patch0001 -p1
 
 %build
 CC="%{__cc}" \
@@ -63,9 +61,8 @@ sed -i -e "s/libuv.so/libuv.so.%{sover}/g" out/{libuv,run-benchmarks,run-tests}.
        LDFLAGS.host="%{rpmldflags}"
 
 %if %{with tests}
-# Tests are currently disabled because some require network access
-#./run-tests
-#./run-benchmarks
+./run-tests
+./run-benchmarks
 %endif
 
 %install