diff --git a/.gitignore b/.gitignore index e5c224a..ec965c0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /luv-1.41.1.0.tar.gz /luv-1.42.0.0.tar.gz /luv-1.42.0.1.tar.gz +/luv-1.43.0.0.tar.gz diff --git a/lua-luv.spec b/lua-luv.spec index 853a045..17ce29d 100644 --- a/lua-luv.spec +++ b/lua-luv.spec @@ -20,8 +20,8 @@ %global luajit_libdir %{_libdir}/luajit/%{luajit_version} %global luajit_builddir obj-luajit -%global real_version 1.42.0 -%global extra_version 1 +%global real_version 1.43.0 +%global extra_version 0 %if 0%{?rhel} && 0%{?rhel} < 9 # EPEL8's cmake macros have _vpath_builddir defined @@ -32,7 +32,7 @@ BuildRequires: cmake BuildRequires: gcc -BuildRequires: libuv-devel >= 1.42.0 +BuildRequires: libuv-devel >= 1.43.0 BuildRequires: lua-devel BuildRequires: compat-lua >= %{lua_51_version} BuildRequires: compat-lua-devel >= %{lua_51_version} @@ -44,7 +44,7 @@ BuildRequires: lua5.1-compat53 Name: lua-luv Version: %{real_version}.%{extra_version} -Release: 3%{?dist} +Release: 1%{?dist} License: ASL 2.0 Summary: Bare libuv bindings for lua @@ -56,7 +56,8 @@ Requires: lua(abi) = %{lua_version} Source0: https://github.com/luvit/luv/archive/%{real_version}-%{extra_version}/luv-%{version}.tar.gz -Patch100: lua-luv-disable-udp-test.patch +# Disable multicast tests as they don't work with firewalld +Patch0: lua-luv-disable-udp-test.patch %description This library makes libuv available to lua scripts. It was made @@ -130,9 +131,7 @@ Files required for luajit%{luajit_version}-luv development %endif %prep -%setup -n luv-%{real_version}-%{extra_version} - -%patch100 -p1 +%autosetup -n luv-%{real_version}-%{extra_version} -p1 # Remove bundled dependencies rm -rf deps @@ -143,9 +142,9 @@ rm -f tests/test-dns.lua %build # lua mkdir %{lua_builddir} +%global __cmake_builddir %{lua_builddir} -pushd %{lua_builddir} -%cmake -S .. \ +%cmake \ -DWITH_SHARED_LIBUV=ON \ -DBUILD_MODULE=ON \ -DBUILD_SHARED_LIBS=ON \ @@ -155,13 +154,12 @@ pushd %{lua_builddir} -DLUA_INCLUDE_DIR=%{lua_incdir} %cmake_build -popd # lua-compat mkdir %{lua_51_builddir} +%global __cmake_builddir %{lua_51_builddir} -pushd %{lua_51_builddir} -%cmake -S .. \ +%cmake \ -DWITH_SHARED_LIBUV=ON \ -DBUILD_MODULE=ON \ -DBUILD_SHARED_LIBS=ON \ @@ -173,14 +171,13 @@ pushd %{lua_51_builddir} -DLUA_LIBRARY=%{_libdir}/liblua-%{lua_51_version}.so %cmake_build -popd %if %{with luajit} # luajit mkdir %{luajit_builddir} +%global __cmake_builddir %{luajit_builddir} -pushd %{luajit_builddir} -%cmake -S .. \ +%cmake \ -DWITH_SHARED_LIBUV=ON \ -DBUILD_MODULE=ON \ -DBUILD_SHARED_LIBS=ON \ @@ -190,14 +187,13 @@ pushd %{luajit_builddir} -DLUA_COMPAT53_DIR=%{lua_51_incdir} %cmake_build -popd # /with luajit %endif %install # lua install -d -m 0755 %{buildroot}%{lua_libdir} -install -m 0755 -p %{lua_builddir}/%{_vpath_builddir}/luv.so %{buildroot}%{lua_libdir}/luv.so +install -m 0755 -p %{lua_builddir}/luv.so %{buildroot}%{lua_libdir}/luv.so install -d -m 0755 %{buildroot}%{lua_incdir}/luv for f in lhandle.h lreq.h luv.h util.h; do @@ -206,7 +202,7 @@ done # lua-5.1 install -d -m 0755 %{buildroot}%{lua_51_libdir} -install -m 0755 -p %{lua_51_builddir}/%{_vpath_builddir}/luv.so %{buildroot}%{lua_51_libdir}/luv.so +install -m 0755 -p %{lua_51_builddir}/luv.so %{buildroot}%{lua_51_libdir}/luv.so install -d -m 0755 %{buildroot}%{lua_51_incdir}/luv for f in lhandle.h lreq.h luv.h util.h; do @@ -216,7 +212,7 @@ done %if %{with luajit} # luajit install -d -m 0755 %{buildroot}%{luajit_libdir} -install -m 0755 -p %{luajit_builddir}/%{_vpath_builddir}/luv.so %{buildroot}%{luajit_libdir}/luv.so +install -m 0755 -p %{luajit_builddir}/luv.so %{buildroot}%{luajit_libdir}/luv.so install -d -m 0755 %{buildroot}%{luajit_incdir}/luv for f in lhandle.h lreq.h luv.h util.h; do @@ -228,17 +224,17 @@ done %if %{with test} %check # lua-5.1 -ln -sf %{lua_51_builddir}/%{_vpath_builddir}/luv.so luv.so +ln -sf %{lua_51_builddir}/luv.so luv.so lua-5.1 tests/run.lua rm luv.so # lua -ln -sf %{lua_builddir}/%{_vpath_builddir}/luv.so luv.so +ln -sf %{lua_builddir}/luv.so luv.so lua tests/run.lua rm luv.so %if %{with luajit} # luajit -ln -sf %{luajit_builddir}/%{_vpath_builddir}/luv.so luv.so +ln -sf %{luajit_builddir}/luv.so luv.so %if 0%{?el8} %ifarch aarch64 # luajit test consistently failing with: @@ -299,6 +295,10 @@ rm luv.so %endif %changelog +* Sat Apr 16 2022 Andreas Schneider - 1.43.0.0-1 +- Update to version 1.43.0.0 + * https://github.com/luvit/luv/releases/tag/1.43.0-0 + * Fri Mar 11 2022 Michel Alexandre Salim - 1.42.0.1-3 - Adjust for cmake 3.23.0, where -S (passed by %%cmake) overrides the positional argument - Disable UDP multicast tests unconditionally, seems flaky diff --git a/sources b/sources index 9b5bfb9..205ddce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (luv-1.42.0.1.tar.gz) = 61ee67bb4577112c818c05861c53b111663bf1e07d5b911e443ce0791262471d3bec3685ae02e32f9e2fd61c0f605cb09f0c65ed979e2c267edee62de697590a +SHA512 (luv-1.43.0.0.tar.gz) = f51d9b3c733dd5617fca49534fdd77dbb6a3d6f58263f453db8dcde21679f4a471e15d6f5b05bcb22a2552455df8beb238d33b0999306bf2a5ad6755da4044ff