diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index a64862f..bc20f81 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,5 +1,5 @@ -mtime: 1760490299 -commit: 6e7d7d058fabe7a87a7d0775b7affde240ffd6983b3632535beb5ff5083018ff +mtime: 1760999899 +commit: d1f0f1035bb04d30b4b3f2362fd2a8fa757179cdb184b24e5b6d27f1245ff673 url: https://src.opensuse.org/lua/lua-macros.git -revision: 6e7d7d058fabe7a87a7d0775b7affde240ffd6983b3632535beb5ff5083018ff +revision: d1f0f1035bb04d30b4b3f2362fd2a8fa757179cdb184b24e5b6d27f1245ff673 projectscmsync: https://src.opensuse.org/lua/_ObsPrj.git diff --git a/build.specials.obscpio b/build.specials.obscpio index bde423a..dda7aff 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6082f8d399db642d6266cef79112e15bb3d04f8bc04878a819fb62642216a15 -size 356 +oid sha256:9dabaf8e4bc02c3a8cc74d03d2b6f464921ef2f2f0e0b010379148c1485ac786 +size 864 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}"