From 2f5ed89d84378e51b0e712ef918f558ce34267fa Mon Sep 17 00:00:00 2001
From: "T.C. Hollingsworth" <tchollingsworth@gmail.com>
Date: Thu, 19 Feb 2015 13:15:26 -0700
Subject: [PATCH] rebase to 1.4.0

---
 .gitignore  |  1 +
 libuv.pc.in |  2 +-
 libuv.spec  | 62 +++++++++++------------------------------------------
 sources     |  2 +-
 4 files changed, 15 insertions(+), 52 deletions(-)

diff --git a/.gitignore b/.gitignore
index f43b28f..277adc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /libuv-v0.10.28.tar.gz
 /libuv-v0.10.29.tar.gz
 /libuv-v0.10.33.tar.gz
+/libuv-v1.4.0.tar.gz
diff --git a/libuv.pc.in b/libuv.pc.in
index c0677d7..cbc7062 100644
--- a/libuv.pc.in
+++ b/libuv.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libuv
 Description: Development libraries for libuv
 Version: @version@
-Libs: -L${libdir} -luv -lrt -ldl
+Libs: -L${libdir} -luv -lrt -lpthread -lnsl -ldl
 Cflags: -I{includedir}
 URL: http://libuv.org/
diff --git a/libuv.spec b/libuv.spec
index 622dc51..0d20c03 100644
--- a/libuv.spec
+++ b/libuv.spec
@@ -4,8 +4,8 @@
 
 Name: libuv
 Epoch:   1
-Version: 0.10.33
-Release: 2%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
 Summary: Platform layer for node.js
 
 Group: System Environment/Libraries
@@ -15,7 +15,7 @@ URL: http://libuv.org/
 Source0: http://libuv.org/dist/v%{version}/%{name}-v%{version}.tar.gz
 Source2: libuv.pc.in
 
-BuildRequires: gyp
+BuildRequires: autoconf automake libtool
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -47,53 +47,13 @@ Static library (.a) version of libuv.
 %setup -q -n %{name}-v%{version}
 
 %build
-export CFLAGS='%{optflags}'
-export CXXFLAGS='%{optflags}'
-%{__python} gyp_uv.py -Dcomponent=shared_library -Dlibrary=shared_library
-
-make %{?_smp_mflags} V=1 -C out BUILDTYPE=Release
-
-mv out out-shared
-
-# build a static version for rust
-%{__python} gyp_uv.py
-make %{?_smp_mflags} V=1 -C out BUILDTYPE=Release
-mv out out-static
+./autogen.sh
+%configure
+make %{?_smp_mflags}
 
 %install
-# Copy the shared lib into the libdir
-mkdir -p %{buildroot}/%{_libdir}/
-cp out-shared/Release/obj.target/libuv.so %{buildroot}/%{_libdir}/libuv.so.%{sover}
-pushd %{buildroot}/%{_libdir}/
-ln -s libuv.so.%{sover} libuv.so.0
-ln -s libuv.so.%{sover} libuv.so
-popd
-
-# Copy the headers into the include path
-mkdir -p %{buildroot}/%{_includedir}/uv-private
-
-cp include/uv.h \
-   %{buildroot}/%{_includedir}
-
-cp \
-   include/uv-private/ngx-queue.h \
-   include/uv-private/tree.h \
-   include/uv-private/uv-linux.h \
-   include/uv-private/uv-unix.h \
-   %{buildroot}/%{_includedir}/uv-private
-
-# Create the pkgconfig file
-mkdir -p %{buildroot}/%{_libdir}/pkgconfig
-
-sed -e "s#@prefix@#%{_prefix}#g" \
-    -e "s#@exec_prefix@#%{_exec_prefix}#g" \
-    -e "s#@libdir@#%{_libdir}#g" \
-    -e "s#@includedir@#%{_includedir}#g" \
-    -e "s#@version@#%{version}#g" \
-    %SOURCE2 > %{buildroot}/%{_libdir}/pkgconfig/libuv.pc
-
-#install the static version
-cp out-static/Release/obj.target/libuv.a %{buildroot}/%{_libdir}
+make DESTDIR=%{buildroot} install
+rm -f %{buildroot}%{_libdir}/libuv.la
 
 %check
 # Tests are currently disabled because some require network access
@@ -112,13 +72,15 @@ cp out-static/Release/obj.target/libuv.a %{buildroot}/%{_libdir}
 %doc README.md AUTHORS LICENSE
 %{_libdir}/libuv.so
 %{_libdir}/pkgconfig/libuv.pc
-%{_includedir}/uv.h
-%{_includedir}/uv-private
+%{_includedir}/uv*.h
 
 %files static
 %{_libdir}/libuv.a
 
 %changelog
+* Thu Feb 19 2015 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:1.4.0-1
+- rebase to 1.4.0
+
 * Thu Feb 19 2015 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.33-2
 - add missing %%{_?isa} to devel requires of main package
 - fix some issues with the pkgconfig file and Group reported by Michael Schwendt
diff --git a/sources b/sources
index 7e765af..21b959b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3189f552d9b67b9b61b067f0f32df144  libuv-v0.10.33.tar.gz
+2508fecc861424f5e856945f87694fa8  libuv-v1.4.0.tar.gz