diff --git a/.gitignore b/.gitignore index 18a8ad4..75aafd6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /luv-1.34.1.1.tar.gz /luv-1.34.2.1.tar.gz /luv-1.36.0.0.tar.gz +/luv-1.41.0.0.tar.gz diff --git a/lua-luv.spec b/lua-luv.spec index cdf15e0..cce5336 100644 --- a/lua-luv.spec +++ b/lua-luv.spec @@ -10,12 +10,12 @@ %global lua_51_pkgdir %{_datadir}/lua/%{lua_51_version} %global lua_51_builddir obj-lua51 -%global real_version 1.36.0 +%global real_version 1.41.0 %global extra_version 0 BuildRequires: cmake BuildRequires: gcc -BuildRequires: libuv-devel +BuildRequires: libuv-devel >= 1.41.0 BuildRequires: lua >= %{lua_54_version} BuildRequires: lua-devel >= %{lua_54_version} BuildRequires: compat-lua >= %{lua_51_version} @@ -24,7 +24,7 @@ BuildRequires: lua5.1-compat53 Name: lua-luv Version: %{real_version}.%{extra_version} -Release: 5%{?dist} +Release: 1%{?dist} License: ASL 2.0 Summary: Bare libuv bindings for lua @@ -33,7 +33,6 @@ Url: https://github.com/luvit/luv Requires: lua(abi) = %{lua_54_version} Source0: https://github.com/luvit/luv/archive/%{real_version}-%{extra_version}/luv-%{version}.tar.gz -Patch0: luv-1.36.0-lua-5.4.patch %if 0%{?el8} # libuv-devel is from the CentOS Devel repo, only available on @@ -132,7 +131,7 @@ pushd %{lua_51_builddir} popd %install -# lua-5.3 +# lua install -d -m 0755 %{buildroot}%{lua_54_libdir} install -m 0755 -p %{lua_54_builddir}/%{_vpath_builddir}/luv.so %{buildroot}%{lua_54_libdir}/luv.so @@ -155,7 +154,7 @@ done ln -sf %{lua_51_builddir}/%{_vpath_builddir}/luv.so luv.so lua-5.1 tests/run.lua rm luv.so -# lua-5.4 +# lua ln -sf %{lua_54_builddir}/%{_vpath_builddir}/luv.so luv.so lua tests/run.lua rm luv.so @@ -187,6 +186,11 @@ rm luv.so %{lua_51_incdir}/luv/util.h %changelog +* Mon Apr 19 2021 Andreas Schneider - 1.41.0.0-1 +* Update to version 1.41.0 + - https://github.com/luvit/luv/releases/tag/1.41.0-0 + - https://github.com/luvit/luv/releases/tag/1.40.0-0 + * Tue Jan 26 2021 Fedora Release Engineering - 1.36.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/luv-1.36.0-lua-5.4.patch b/luv-1.36.0-lua-5.4.patch deleted file mode 100644 index c33641c..0000000 --- a/luv-1.36.0-lua-5.4.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up luv-1.36.0-0/src/luv.c.lua54 luv-1.36.0-0/src/luv.c ---- luv-1.36.0-0/src/luv.c.lua54 2020-06-30 13:51:22.099551123 -0400 -+++ luv-1.36.0-0/src/luv.c 2020-06-30 13:51:32.299385613 -0400 -@@ -16,7 +16,7 @@ - */ - - #include --#if (LUA_VERSION_NUM != 503) -+#if LUA_VERSION_NUM < 503 - #include "compat-5.3.h" - #endif - #include "luv.h" -diff -up luv-1.36.0-0/src/private.h.lua54 luv-1.36.0-0/src/private.h ---- luv-1.36.0-0/src/private.h.lua54 2020-06-30 13:51:04.843831128 -0400 -+++ luv-1.36.0-0/src/private.h 2020-06-30 13:51:13.179695862 -0400 -@@ -2,7 +2,7 @@ - #define LUV_PRIVATE_H - - #include --#if (LUA_VERSION_NUM != 503) -+#if LUA_VERSION_NUM < 503 - #include "compat-5.3.h" - #endif - -diff -up luv-1.36.0-0/CMakeLists.txt.lua54 luv-1.36.0-0/CMakeLists.txt ---- luv-1.36.0-0/CMakeLists.txt.lua54 2020-06-30 14:04:54.323356407 -0400 -+++ luv-1.36.0-0/CMakeLists.txt 2020-06-30 14:05:16.083002829 -0400 -@@ -94,7 +94,7 @@ if (LUA) - NO_DEFAULT_PATH) - ELSEIF(LUA_EXEC_NAME MATCHES "lua.*") - FIND_LIBRARY(LUA_LIBRARIES -- NAMES lua lua53 lua52 lua51 liblua liblua53 liblua52 liblua51 -+ NAMES lua lua54 lua53 lua52 lua51 liblua liblua54 liblua53 liblua52 liblua51 - PATHS ${LUA_LIBDIR} - NO_DEFAULT_PATH) - ENDIF() diff --git a/sources b/sources index 799f303..80d2587 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (luv-1.36.0.0.tar.gz) = 3119c1450a8317725d59cc1ab6afccfbde752b0c32b38909dfdd31bf88ea0751920dc68750da52cf17a6430637cf1094f4d5500e4c50d1145eca48bb12728ba1 +SHA512 (luv-1.41.0.0.tar.gz) = 9330194af921f414ed63c4ef45e7c91f3ce8f143c28ca7a554bfc1652265e8aebbe1287de5a42f470eef252481bedc5bd0579b19222f12261f58750c8bc4e689