[packages/lutok] - added default-lua patch (build with default lua); release 4

qboosh qboosh at pld-linux.org
Mon Oct 26 20:57:59 CET 2020


commit 04e2a4e4255324d65670c5635def3487a011e468
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Oct 26 20:57:49 2020 +0100

    - added default-lua patch (build with default lua); release 4

 lutok-default-lua.patch | 30 ++++++++++++++++++++++++++++++
 lutok.spec              | 10 ++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)
---
diff --git a/lutok.spec b/lutok.spec
index a844342..997195b 100644
--- a/lutok.spec
+++ b/lutok.spec
@@ -2,18 +2,19 @@ Summary:	Lightweight C++ API library for Lua
 Summary(pl.UTF-8):	Lekka biblioteka API C++ dla Lua
 Name:		lutok
 Version:	0.4
-Release:	3
+Release:	4
 License:	BSD
 Group:		Libraries
 #Source0Download: https://github.com/jmmv/lutok/releases
 Source0:	https://github.com/jmmv/lutok/releases/download/%{name}-%{version}/lutok-%{version}.tar.gz
 # Source0-md5:	5da43895d9209f8c19d79433dd046b3f
+Patch0:		%{name}-default-lua.patch
 URL:		https://github.com/jmmv/lutok
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.65
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	libatf-c++-devel >= 0.20
 BuildRequires:	libatf-sh-devel >= 0.20
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2
 BuildRequires:	lua53-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -116,6 +117,7 @@ Statyczna biblioteka liblutok.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/lutok-default-lua.patch b/lutok-default-lua.patch
new file mode 100644
index 0000000..d2c9f02
--- /dev/null
+++ b/lutok-default-lua.patch
@@ -0,0 +1,30 @@
+--- lutok-0.4/m4/lua.m4.orig	2013-10-11 23:44:43.000000000 +0200
++++ lutok-0.4/m4/lua.m4	2020-10-26 06:21:59.318204354 +0100
+@@ -34,7 +34,11 @@
+ AC_DEFUN([KYUA_LUA], [
+     lua_found=no
+ 
+-    for lua_release in 5.2 5.1; do
++    PKG_CHECK_MODULES([LUA], [lua >= 5.1],
++                      [lua_found=yes], [true])
++
++    if test "${lua_found}" = no; then
++    for lua_release in 5.4 5.3 5.2 5.1; do
+         if test "${lua_found}" = no; then
+             PKG_CHECK_MODULES([LUA], [lua${lua_release} >= ${lua_release}],
+                               [lua_found=yes], [true])
+@@ -43,13 +47,10 @@
+             PKG_CHECK_MODULES([LUA], [lua-${lua_release} >= ${lua_release}],
+                               [lua_found=yes], [true])
+         fi
+-        if test "${lua_found}" = no; then
+-            PKG_CHECK_MODULES([LUA], [lua >= ${lua_release}],
+-                              [lua_found=yes], [true])
+-        fi
+ 
+         test "${lua_found}" = no || break
+     done
++    fi
+ 
+     if test "${lua_found}" = no; then
+         AC_PATH_PROGS([LUA_CONFIG], [lua-config], [unset])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lutok.git/commitdiff/04e2a4e4255324d65670c5635def3487a011e468



More information about the pld-cvs-commit mailing list