diff --git a/.gitignore b/.gitignore index 9bae2f6..2898e41 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,8 @@ /libuv-v0.10.29.tar.gz /libuv-v0.10.33.tar.gz /libuv-v0.10.34.tar.gz +/libuv-v1.4.0.tar.gz +/libuv-v1.7.5.tar.gz +/libuv-v1.8.0.tar.gz +/libuv-v1.9.0.tar.gz +/libuv-v1.9.1.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 6b64431..b96ccec 100644 --- a/libuv.spec +++ b/libuv.spec @@ -1,22 +1,18 @@ -#we only need major.minor in the SONAME in the stable (even numbered) series -#this should be changed to %%{version} in unstable (odd numbered) releases -%global sover 0.10 Name: libuv Epoch: 1 -Version: 0.10.34 -Release: 2%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: Platform layer for node.js Group: System Environment/Libraries # the licensing breakdown is described in detail in the LICENSE file License: MIT and BSD and ISC URL: http://libuv.org/ -Source0: http://libuv.org/dist/v%{version}/%{name}-v%{version}.tar.gz +Source0: http://dist.libuv.org/dist/v%{version}/libuv-v%{version}.tar.gz Source2: libuv.pc.in -BuildRequires: gyp -BuildRequires: util-linux +BuildRequires: autoconf automake libtool Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -48,53 +44,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 @@ -106,20 +62,23 @@ cp out-static/Release/obj.target/libuv.a %{buildroot}/%{_libdir} %postun -p /sbin/ldconfig %files -%doc README.md AUTHORS LICENSE +%doc README.md AUTHORS +%license LICENSE %{_libdir}/libuv.so.* %files devel -%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 +* Wed May 18 2016 Stephen Gallagher - 1.9.1-1 +- Update to 1.9.1 +- https://github.com/libuv/libuv/blob/v1.9.1/ChangeLog + * Mon Dec 07 2015 Dan HorĂ¡k - 1:0.10.34-2 - update BR diff --git a/sources b/sources index a7c7c2b..5d17b5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7129911e2bffe23cf7273f2cf8717281 libuv-v0.10.34.tar.gz +654bf6783ac7fc10435c84ec86720a6e libuv-v1.9.1.tar.gz