Accepting request 853273 from home:gmbr3:Lua

Fix

OBS-URL: https://build.opensuse.org/request/show/853273
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua54?expand=0&rev=19
This commit is contained in:
Callum Farmer 2020-12-05 15:37:32 +00:00 committed by Git OBS Bridge
parent cb10aadcc5
commit d8bf7fc59c
4 changed files with 11 additions and 10 deletions

View File

@ -1,5 +1,5 @@
--- a/lua-@VERSION-tests/attrib.lua --- a/lua-tests/attrib.lua
+++ b/lua-@VERSION-tests/attrib.lua +++ b/lua-tests/attrib.lua
@@ -269,7 +269,7 @@ local p = "" -- On Mac OS X, redefine @@ -269,7 +269,7 @@ local p = "" -- On Mac OS X, redefine
local st, err, when = package.loadlib(DC"lib1", "*") local st, err, when = package.loadlib(DC"lib1", "*")
if not st then if not st then

View File

@ -1,7 +1,7 @@
Index: lua-@VERSION/lua-@VERSION-tests/files.lua Index: lua/lua-tests/files.lua
=================================================================== ===================================================================
--- lua-@VERSION.orig/lua-@VERSION-tests/files.lua --- lua.orig/lua-tests/files.lua
+++ lua-@VERSION/lua-@VERSION-tests/files.lua +++ lua/lua-tests/files.lua
@@ -81,7 +81,7 @@ assert(io.output() ~= io.stdout) @@ -81,7 +81,7 @@ assert(io.output() ~= io.stdout)
if not _port then -- invalid seek if not _port then -- invalid seek

View File

@ -123,8 +123,9 @@ scripting, and rapid prototyping. Lua is implemented as a small library
of C functions, written in ANSI C. of C functions, written in ANSI C.
%prep %prep
sed -i -e "s-@VERSION-%{version}-g" %{PATCH1} %{PATCH2} %{PATCH3} %setup -q -n lua-%{version} -a1
%autosetup -n lua-%{version} -p1 -a1 mv lua-%{version}-tests lua-tests
%autopatch -p1
# manpage # manpage
cat doc/lua.1 | sed 's/TH LUA 1/TH LUA%{major_version} 1/' > doc/lua%{major_version}.1 cat doc/lua.1 | sed 's/TH LUA 1/TH LUA%{major_version} 1/' > doc/lua%{major_version}.1
@ -186,7 +187,7 @@ touch %{buildroot}%{_sysconfdir}/alternatives/lua.pc
ln -sf %{_sysconfdir}/alternatives/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc ln -sf %{_sysconfdir}/alternatives/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc
%check %check
cd ./lua-%{version}-tests/ cd ./lua-tests/
LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}%{_bindir}/lua%{major_version} all.lua LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}%{_bindir}/lua%{major_version} all.lua
%post -n %{libname} -p /sbin/ldconfig %post -n %{libname} -p /sbin/ldconfig

View File

@ -1,5 +1,5 @@
--- a/lua-@VERSION-tests/main.lua --- a/lua-tests/main.lua
+++ b/lua-@VERSION-tests/main.lua +++ b/lua-tests/main.lua
@@ -307,11 +307,11 @@ @@ -307,11 +307,11 @@
]] ]]
RUN([[lua -e "%s" -i < %s > %s]], prompt, prog, out) RUN([[lua -e "%s" -i < %s > %s]], prompt, prog, out)