diff --git a/.gitignore b/.gitignore index 6fd5777..61169ce 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /release-v32.tar.gz /release-v33.2.1.tar.gz /release-v33.3.1.tar.gz +/release-v34.1.1.tar.gz diff --git a/lua-posix-helpers-5.4.patch b/lua-posix-helpers-5.4.patch index 9eb9b99..8524dd4 100644 --- a/lua-posix-helpers-5.4.patch +++ b/lua-posix-helpers-5.4.patch @@ -1,6 +1,6 @@ -diff -up luaposix-release-v33.3.1/ext/include/_helpers.c.54 luaposix-release-v33.3.1/ext/include/_helpers.c ---- luaposix-release-v33.3.1/ext/include/_helpers.c.54 2020-06-29 23:52:30.433291702 -0400 -+++ luaposix-release-v33.3.1/ext/include/_helpers.c 2020-06-29 23:52:53.714914130 -0400 +diff -up luaposix-release-v34.1.1/ext/include/_helpers.c.54 luaposix-release-v34.1.1/ext/include/_helpers.c +--- luaposix-release-v34.1.1/ext/include/_helpers.c.54 2020-07-03 11:48:23.799667686 -0600 ++++ luaposix-release-v34.1.1/ext/include/_helpers.c 2020-07-03 11:49:11.907158779 -0600 @@ -67,7 +67,7 @@ # endif #endif @@ -9,4 +9,4 @@ diff -up luaposix-release-v33.3.1/ext/include/_helpers.c.54 luaposix-release-v33 +#if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 504 # define lua_objlen lua_rawlen # define lua_strlen lua_rawlen - # define luaL_openlib(L,n,l,nup) luaL_setfuncs((L),(l),(nup)) + #endif diff --git a/lua-posix-local-bit32.patch b/lua-posix-local-bit32.patch index 63ddc4a..9193333 100644 --- a/lua-posix-local-bit32.patch +++ b/lua-posix-local-bit32.patch @@ -1,138 +1,40 @@ -diff -up luaposix-release-v33.3.1/lib/posix/compat.lua.pbit32 luaposix-release-v33.3.1/lib/posix/compat.lua ---- luaposix-release-v33.3.1/lib/posix/compat.lua.pbit32 2020-06-30 00:18:20.418176545 -0400 -+++ luaposix-release-v33.3.1/lib/posix/compat.lua 2020-06-30 00:18:54.540622774 -0400 -@@ -11,7 +11,7 @@ - ]] - - local _argcheck = require "posix._argcheck" --local bit = require "bit32" -+local bit = require "posix.bit32" - - local argerror, argtypeerror, badoption = - _argcheck.argerror, _argcheck.argtypeerror, _argcheck.badoption -@@ -137,7 +137,7 @@ local M = { - -- @see chmod(2) - -- @usage P.chmod ('bin/dof', '+x') - --local bit = require "bit32" -+local bit = require "posix.bit32" - local st = require "posix.sys.stat" - - local _chmod, stat = st.chmod, st.stat -@@ -179,7 +179,7 @@ end - -- @usage - -- fd = P.creat ("data", "rw-r-----") - --local bit = require "bit32" -+local bit = require "posix.bit32" - local fcntl = require "posix.fcntl" - local st = require "posix.sys.stat" - -@@ -218,7 +218,7 @@ end - -- @treturn[2] string error message - -- @treturn[2] int errnum - --local bit = require "bit32" -+local bit = require "posix.bit32" - local st = require "posix.sys.stat" - - local _mkdir = st.mkdir -@@ -248,7 +248,7 @@ end - -- @treturn[2] string error message - -- @treturn[2] int errnum - --local bit = require "bit32" -+local bit = require "posix.bit32" - local st = require "posix.sys.stat" - - local _mkfifo = st.mkfifo -@@ -281,7 +281,7 @@ end - -- @treturn[2] int errnum - -- @see msgget(2) - --local bit = require "bit32" -+local bit = require "posix.bit32" - local msg = require "posix.sys.msg" - local st = require "posix.sys.stat" - -@@ -332,7 +332,7 @@ end - -- @usage - -- fd = P.open ("data", bit.bor (P.O_CREAT, P.O_RDWR), "rw-r-----") - --local bit = require "bit32" -+local bit = require "posix.bit32" - local fcntl = require "posix.fcntl" - - local _open, O_CREAT = fcntl.open, fcntl.O_CREAT -@@ -376,7 +376,7 @@ end - -- @treturn[2] string error message - -- @treturn[2] int errnum - --local bit = require "bit32" -+local bit = require "posix.bit32" - local log = require "posix.syslog" - - local bor = bit.bor -diff -up luaposix-release-v33.3.1/lib/posix/deprecated.lua.pbit32 luaposix-release-v33.3.1/lib/posix/deprecated.lua ---- luaposix-release-v33.3.1/lib/posix/deprecated.lua.pbit32 2020-06-30 00:19:01.594508297 -0400 -+++ luaposix-release-v33.3.1/lib/posix/deprecated.lua 2020-06-30 00:19:16.466266944 -0400 -@@ -11,7 +11,7 @@ - ]] - - local _argcheck = require "posix._argcheck" --local bit = require "bit32" -+local bit = require "posix.bit32" - - -- Lua 5.3 has table.unpack but not _G.unpack - -- Lua 5.2 has table.unpack and _G.unpack -@@ -748,7 +748,7 @@ end - -- `LOG_LOCAL0` through `LOG_LOCAL7` - -- @see syslog(3) - --local bit = require "bit32" -+local bit = require "posix.bit32" - local log = require "posix.syslog" - - local bor = bit.bor -diff -up luaposix-release-v33.3.1/lib/posix/init.lua.pbit32 luaposix-release-v33.3.1/lib/posix/init.lua ---- luaposix-release-v33.3.1/lib/posix/init.lua.pbit32 2020-06-30 00:17:53.219617951 -0400 -+++ luaposix-release-v33.3.1/lib/posix/init.lua 2020-06-30 00:18:10.467338039 -0400 -@@ -14,7 +14,7 @@ - @module posix - ]] - --local bit = require "bit32" -+local bit = require "posix.bit32" - local M = {} - - -@@ -151,7 +151,7 @@ end - -- @return[2] nil - -- @treturn[2] string error message - --local bit = require "bit32" -+local bit = require "posix.bit32" - local fcntl = require "posix.fcntl" - local stdlib = require "posix.stdlib" - local unistd = require "posix.unistd" -diff -up luaposix-release-v33.3.1/lib/posix.lua.in.pbit32 luaposix-release-v33.3.1/lib/posix.lua.in ---- luaposix-release-v33.3.1/lib/posix.lua.in.pbit32 2020-06-30 00:19:28.732067880 -0400 -+++ luaposix-release-v33.3.1/lib/posix.lua.in 2020-06-30 00:19:40.803871968 -0400 -@@ -14,7 +14,7 @@ - @module posix - ]] - --local bit = require "bit32" -+local bit = require "posix.bit32" - local M = {} - - -@@ -151,7 +151,7 @@ end - -- @return[2] nil - -- @treturn[2] string error message - --local bit = require "bit32" -+local bit = require "posix.bit32" - local fcntl = require "posix.fcntl" - local stdlib = require "posix.stdlib" - local unistd = require "posix.unistd" +diff -up luaposix-release-v34.1.1/lib/posix/compat.lua.pbit32 luaposix-release-v34.1.1/lib/posix/compat.lua +--- luaposix-release-v34.1.1/lib/posix/compat.lua.pbit32 2020-07-03 11:44:29.279360146 -0600 ++++ luaposix-release-v34.1.1/lib/posix/compat.lua 2020-07-03 11:46:56.268014630 -0600 +@@ -34,9 +34,9 @@ local S_IXUSR = require 'posix.sys.stat' + local argerror = require 'posix._base'.argerror + local argscheck = require 'posix._base'.argscheck + local chmod = require 'posix.sys.stat'.chmod +-local band = require 'bit32'.band +-local bnot = require 'bit32'.bnot +-local bor = require 'bit32'.bor ++local band = require 'posix.bit32'.band ++local bnot = require 'posix.bit32'.bnot ++local bor = require 'posix.bit32'.bor + local concat = table.concat + local gsub = string.gsub + local match = string.match +diff -up luaposix-release-v34.1.1/lib/posix/deprecated.lua.pbit32 luaposix-release-v34.1.1/lib/posix/deprecated.lua +--- luaposix-release-v34.1.1/lib/posix/deprecated.lua.pbit32 2020-07-03 11:44:29.281360122 -0600 ++++ luaposix-release-v34.1.1/lib/posix/deprecated.lua 2020-07-03 11:47:43.726321553 -0600 +@@ -59,7 +59,7 @@ local _ENV = require 'posix._strict' { + argerror = require 'posix._base'.argerror, + argscheck = require 'posix._base'.argscheck, + bind = require 'posix.sys.socket'.bind, +- bor = require 'bit32'.bor, ++ bor = require 'posix.bit32'.bor, + clock_getres = require 'posix.time'.clock_getres or false, + clock_gettime = require 'posix.time'.clock_gettime or false, + connect = require 'posix.sys.socket'.connect, +diff -up luaposix-release-v34.1.1/lib/posix/init.lua.pbit32 luaposix-release-v34.1.1/lib/posix/init.lua +--- luaposix-release-v34.1.1/lib/posix/init.lua.pbit32 2020-07-03 11:44:29.282360110 -0600 ++++ luaposix-release-v34.1.1/lib/posix/init.lua 2020-07-03 11:47:26.787212000 -0600 +@@ -29,7 +29,7 @@ local _ENV = require 'posix._strict' { + access = require 'posix.unistd'.access, + argscheck = require 'posix._base'.argscheck, + assert = assert, +- bor = require 'bit32'.bor, ++ bor = require 'posix.bit32'.bor, + close = require 'posix.unistd'.close, + dup2 = require 'posix.unistd'.dup2, + errno = require 'posix.errno'.errno, diff --git a/lua-posix.spec b/lua-posix.spec index 7c1f164..740ec8d 100644 --- a/lua-posix.spec +++ b/lua-posix.spec @@ -5,8 +5,8 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: lua-posix -Version: 33.3.1 -Release: 17%{?dist} +Version: 34.1.1 +Release: 1%{?dist} Summary: A POSIX library for Lua License: MIT URL: http://luaforge.net/projects/luaposix/ @@ -21,9 +21,6 @@ Patch0: lua-posix-local-bit32.patch Patch1: lua-posix-helpers-5.4.patch BuildRequires: gcc BuildRequires: lua-devel -BuildRequires: ncurses-devel -BuildRequires: lua-lunit -BuildRequires: perl-interpreter %{?lua_requires} %description @@ -35,32 +32,35 @@ to Lua programs. %patch0 -p1 -b .pbit32 %patch1 -p1 -b .54 -# allow lua 5.4 -sed -i 's|5.4|5.5|g' configure - %build -%configure --libdir=%{lua_libdir} --datadir=/%{lua_pkgdir} -make V=1 %{?_smp_mflags} +build-aux/luke CFLAGS="%build_cflags" %install -make install DESTDIR=$RPM_BUILD_ROOT -cp -a %{SOURCE1} $RPM_BUILD_ROOT%{lua_pkgdir}/posix/ +build-aux/luke PREFIX=%{buildroot}%{_prefix} install +cp -a %{SOURCE1} %{buildroot}%{lua_pkgdir}/posix/ +# Fix install location +# https://github.com/luaposix/luaposix/issues/331 +%if "%_lib" != "lib" +mv %{buildroot}%{_prefix}/lib %{buildroot}%{_prefix}/%{_lib} +%endif -%check -make V=1 check + +#check +# Tests require specl which is not yet packaged %files -%license COPYING -%doc AUTHORS ChangeLog NEWS README -%{_defaultdocdir}/luaposix/ +%license LICENSE +%doc AUTHORS ChangeLog.old NEWS.md README.md %{lua_libdir}/* -%{lua_pkgdir}/*.lua %{lua_pkgdir}/posix/ %changelog +* Fri Jul 03 2020 Orion Poplawski - 34.1.1-1 +- Update to 34.1.1 (bz#1849450) + * Mon Jun 29 2020 Tom Callaway - 33.3.1-17 - hack this ancient beastie to work with lua 5.4 - maintainer, please update this to the current upstream release at your earliest convenience diff --git a/sources b/sources index d98eedb..0510068 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1d07112a5582b539930066d7c834643f release-v33.3.1.tar.gz +SHA512 (release-v34.1.1.tar.gz) = 8ec0cd067c9e0d704ca2a363cdec71195f107783ebc6c0164e290bce77e39b4844132363522c4a443cbf3285335391bc7479b0782fd571c3805ddc59492c2bbd