From 60b20c88fbffdaffee9056ae3ec285a3fc12e07efeb4a33302931622af631add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Mon, 20 Oct 2025 23:31:04 +0200 Subject: [PATCH] Rewrite %luarocks_install to use a shell script install-lua-rock.sh, which is packaged as well. --- install-lua-rock.sh | 15 +++++++++++++++ lua-macros.changes | 6 ++++++ lua-macros.spec | 5 ++++- macros.lua | 5 +---- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100755 install-lua-rock.sh diff --git a/install-lua-rock.sh b/install-lua-rock.sh new file mode 100755 index 0000000..0af22b6 --- /dev/null +++ b/install-lua-rock.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -ex + +# 1. %{lua_version} +# 2. %{buildroot}%{_prefix} +# 3. %{buildroot}%{luarocks_treedir}/%{mod_name} + +SOURCE_DIR="$3" +luarocks --lua-version="$1" --tree="$2" install --deps-mode=none --no-manifest "${*:$#}" + +if [ -d "${SOURCE_DIR}" ] && [ "$(find "${SOURCE_DIR}" -type f | wc -l)" -gt 0 ] +then + mkdir -p __rocktree + mv -v "${SOURCE_DIR}"/* __rocktree +fi diff --git a/lua-macros.changes b/lua-macros.changes index ad782d3..212fcad 100644 --- a/lua-macros.changes +++ b/lua-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 20 21:30:36 UTC 2025 - Matej Cepl + +- Rewrite %luarocks_install to use a shell script + install-lua-rock.sh, which is packaged as well. + ------------------------------------------------------------------- Tue Oct 14 23:16:09 UTC 2025 - Matej Cepl diff --git a/lua-macros.spec b/lua-macros.spec index ad90da4..b37388a 100644 --- a/lua-macros.spec +++ b/lua-macros.spec @@ -27,6 +27,7 @@ License: MIT Group: Development/Languages/Other URL: https://www.lua.org Source0: macros.lua +Source1: install-lua-rock.sh %if 0%{?suse_version} > 1600 Requires: lua-interpreter %elif 0%{?suse_version} >= 1500 @@ -46,9 +47,11 @@ cp -p %{SOURCE0} . : %install -install -Dm644 macros.lua %{buildroot}%{_rpmmacrodir}/macros.lua +install -Dm644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/macros.lua +install -Dm755 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/install-lua-rock.sh %files %{_rpmmacrodir}/macros.lua +%{_rpmconfigdir}/install-lua-rock.sh %changelog diff --git a/macros.lua b/macros.lua index bef1151..5d4307f 100644 --- a/macros.lua +++ b/macros.lua @@ -97,7 +97,4 @@ luarocks --lua-version "%{lua_version}" make --deps-mode none --pack-binary-rock %luarocks_treedir %{_prefix}/lib/luarocks/rocks-%{lua_version} %luarocks_install \ - /bin/sh -c 'luarocks --lua-version="%{lua_version}" --tree="%{buildroot}%{_prefix}" install --deps-mode=none --no-manifest "$@" && \ - source_dir="%{buildroot}%{luarocks_treedir}/%{mod_name}/%{rock_version}" && \ - [ -d "${source_dir}" ] && [ "$(ls -A "${source_dir}" | wc -l)" -gt 0 ] && \ - mv -v "${source_dir}" __rocktree' -- + %{_rpmconfigdir}/install-lua-rock.sh "%{lua_version}" "%{buildroot}%{_prefix}" "%{buildroot}%{luarocks_treedir}/%{mod_name}"