From aaf0677dcbc6a46f2decf0458da0f73c5f7214bc0a6443b02fa4b5589102fd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Thu, 8 Apr 2021 13:42:15 +0000 Subject: [PATCH] Accepting request 883812 from home:Guillaume_G:branches:openSUSE:Backports:SLE-15-SP3 - Build against lua 5.3 (for non-luajit) for Leap/SLE since lua 5.4 is in Tumbleweed only OBS-URL: https://build.opensuse.org/request/show/883812 OBS-URL: https://build.opensuse.org/package/show/editors/neovim?expand=0&rev=81 --- neovim.changes | 6 ++++++ neovim.spec | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/neovim.changes b/neovim.changes index 16f5467..61c806a 100644 --- a/neovim.changes +++ b/neovim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 8 10:06:46 UTC 2021 - Guillaume GARDET + +- Build against lua 5.3 (for non-luajit) for Leap/SLE since + lua 5.4 is in Tumbleweed only + ------------------------------------------------------------------- Tue Jan 12 09:36:47 UTC 2021 - Guillaume GARDET diff --git a/neovim.spec b/neovim.spec index 7e48780..a84b365 100644 --- a/neovim.spec +++ b/neovim.spec @@ -26,8 +26,13 @@ %define luaver 5.1 %define luaver_nopoint 51 %else +%if 0%{?suse_version} > 1500 %define luaver 5.4 %define luaver_nopoint 54 +%else +%define luaver 5.3 +%define luaver_nopoint 53 +%endif %endif %define luv_min_ver 1.30.0 @@ -88,9 +93,11 @@ BuildRequires: lua%{luaver_nopoint}-luv-devel >= %{luv_min_ver} BuildRequires: lua%{luaver_nopoint}-mpack Requires: lua%{luaver_nopoint}-luv >= %{luv_min_ver} # built-in bit32 removed in Lua 5.4 +%if %{luaver_nopoint} > 53 BuildRequires: lua%{luaver_nopoint}-compat-5.3 Requires: lua%{luaver_nopoint}-compat-5.3 %endif +%endif BuildRequires: make BuildRequires: msgpack-devel BuildRequires: pkgconfig