Merge branch 'master' into f19

This commit is contained in:
T.C. Hollingsworth 2013-03-31 16:21:01 -07:00
commit c643145607
2 changed files with 13 additions and 21 deletions

View File

@ -1,8 +0,0 @@
#!/usr/bin/env bash
git clone https://github.com/joyent/libuv.git
pushd libuv
git archive --format=tar --prefix=libuv-0.10.0/ 5462dab8890c414154690d8a45b1384301b27436 | gzip -nc > ../libuv-0.10.0git5462dab.tar.gz
popd
rm -Rf libuv

View File

@ -6,18 +6,14 @@
Name: libuv Name: libuv
Epoch: 1 Epoch: 1
Version: 0.10.0 Version: 0.10.3
Release: 2.git%{git_snapshot}%{?dist} Release: 1%{?dist}
Summary: Platform layer for node.js Summary: Platform layer for node.js
Group: Development/Tools Group: Development/Tools
License: MIT License: MIT
URL: http://nodejs.org/ URL: http://nodejs.org/
Source0: http://libuv.org/dist/v%{version}/%{name}-v%{version}.tar.gz
# Generated by:
# libuv-snapshot.sh
Source0: libuv-%{version}git%{git_snapshot}.tar.gz
Source1: libuv-snapshot.sh
Source2: libuv.pc.in Source2: libuv.pc.in
BuildRequires: gyp BuildRequires: gyp
@ -45,7 +41,7 @@ Requires(postun): /sbin/ldconfig
Development libraries for libuv Development libraries for libuv
%prep %prep
%setup -q %setup -q -n %{name}-v%{version}
%build %build
export CFLAGS='%{optflags}' export CFLAGS='%{optflags}'
@ -76,14 +72,14 @@ popd
# Copy the headers into the include path # Copy the headers into the include path
mkdir -p %{buildroot}/%{_includedir}/uv-private mkdir -p %{buildroot}/%{_includedir}/uv-private
cp %{_builddir}/%{name}-%{version}/include/uv.h \ cp include/uv.h \
%{buildroot}/%{_includedir} %{buildroot}/%{_includedir}
cp \ cp \
%{_builddir}/%{name}-%{version}/include/uv-private/ngx-queue.h \ include/uv-private/ngx-queue.h \
%{_builddir}/%{name}-%{version}/include/uv-private/tree.h \ include/uv-private/tree.h \
%{_builddir}/%{name}-%{version}/include/uv-private/uv-linux.h \ include/uv-private/uv-linux.h \
%{_builddir}/%{name}-%{version}/include/uv-private/uv-unix.h \ include/uv-private/uv-unix.h \
%{buildroot}/%{_includedir}/uv-private %{buildroot}/%{_includedir}/uv-private
# Create the pkgconfig file # Create the pkgconfig file
@ -117,6 +113,10 @@ sed -e "s#@prefix@#%{_prefix}#g" \
%{_includedir}/uv-private %{_includedir}/uv-private
%changelog %changelog
* Sun Mar 31 2013 tchollingsworth@gmail.com - 1:0.10.3-1
- rebase to 0.10.3
- upstream now does proper releases
* Tue Mar 12 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.0-2.git5462dab * Tue Mar 12 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.0-2.git5462dab
- drop the patchlevel from the SONAME since libuv will retain binary - drop the patchlevel from the SONAME since libuv will retain binary
compatibility for the life of the 0.10.x series compatibility for the life of the 0.10.x series