From: Elan Ruusamäe Date: Thu, 1 Aug 2013 13:40:39 +0000 (+0300) Subject: cleanups, update license, soname handled correctly by upstream X-Git-Tag: auto/th/libuv-0.10.13-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=9b353dfd983e116f317677e58829e47d521be6d2;p=packages%2Flibuv.git cleanups, update license, soname handled correctly by upstream --- diff --git a/libuv.spec b/libuv.spec index c31a276..cc1be26 100644 --- a/libuv.spec +++ b/libuv.spec @@ -2,13 +2,12 @@ # Conditional build: %bcond_with tests # build with tests (require network access) -# git log -1 --pretty=format:%h v0.10.13 -%define git_snapshot 381312e Summary: Platform layer for node.js Name: libuv Version: 0.10.13 Release: 1 -License: MIT +# the licensing breakdown is described in detail in the LICENSE file +License: MIT and BSD and ISC Group: Development/Tools URL: http://nodejs.org/ Source0: http://libuv.org/dist/v%{version}/%{name}-v%{version}.tar.gz @@ -34,7 +33,7 @@ Group: Development/Tools Requires: %{name} = %{version}-%{release} %description devel -Development libraries for libuv +Development libraries for libuv. %prep %setup -q -n %{name}-v%{version} @@ -49,9 +48,6 @@ CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}" \ -Dcomponent=shared_library \ -Dlibrary=shared_library -# Modify the build so it produces a versioned shared library -sed -i -e "s/libuv.so/libuv.so.%{sover}/g" out/{libuv,run-benchmarks,run-tests}.target.mk - %{__make} V=1 -C out \ CC="%{__cc}" \ CXX="%{__cxx}" \ @@ -69,7 +65,7 @@ sed -i -e "s/libuv.so/libuv.so.%{sover}/g" out/{libuv,run-benchmarks,run-tests}. rm -rf $RPM_BUILD_ROOT # Copy the shared lib into the libdir install -d $RPM_BUILD_ROOT%{_libdir} -cp -p out/Release/obj.target/libuv.so.%{sover} $RPM_BUILD_ROOT%{_libdir}/libuv.so.%{version} +cp -p out/Release/obj.target/libuv.so $RPM_BUILD_ROOT%{_libdir}/libuv.so.%{version} lib=$(basename $RPM_BUILD_ROOT%{_libdir}/libuv.so.*.*.*) ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libuv.so.%{sover} ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libuv.so @@ -90,7 +86,7 @@ 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}.git%{git_snapshot}#g" \ + -e "s#@version@#%{version}#g" \ %{SOURCE2} > $RPM_BUILD_ROOT%{_pkgconfigdir}/libuv.pc %clean @@ -107,7 +103,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) -%doc README.md AUTHORS LICENSE %{_libdir}/libuv.so %{_pkgconfigdir}/libuv.pc %{_includedir}/uv.h