Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lua-macros for openSUSE:Factory checked in at 2026-03-01 22:14:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua-macros (Old) and /work/SRC/openSUSE:Factory/.lua-macros.new.29461 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua-macros" Sun Mar 1 22:14:06 2026 rev:16 rq:1335528 version:20210827 Changes: -------- --- /work/SRC/openSUSE:Factory/lua-macros/lua-macros.changes 2025-11-05 16:20:06.806641192 +0100 +++ /work/SRC/openSUSE:Factory/.lua-macros.new.29461/lua-macros.changes 2026-03-01 22:14:33.517306912 +0100 @@ -1,0 +2,32 @@ +Sat Feb 28 01:36:22 UTC 2026 - Matej Cepl <[email protected]> + +- Don't double escape, just once is enough. + +------------------------------------------------------------------- +Fri Feb 27 07:46:29 UTC 2026 - Matej Cepl <[email protected]> + +- Define %alternatives_requires_exclude macro. + +------------------------------------------------------------------- +Thu Feb 26 01:34:55 UTC 2026 - Matej Cepl <[email protected]> + +- Macro lua_exec for testing + +------------------------------------------------------------------- +Wed Feb 25 22:27:05 UTC 2026 - Matej Cepl <[email protected]> + +- %lua_value should return just a replaced string, not a tuple + like :gsub() method does. + +------------------------------------------------------------------- +Thu Jan 29 20:20:41 UTC 2026 - Matej Cepl <[email protected]> + +- Add %lua_value macro, useful for alternatives. + +------------------------------------------------------------------- +Thu Nov 6 19:08:52 UTC 2025 - Michal Suchanek <[email protected]> + +- macros.lua: Fix parsing on older SLE releases. Older RPM + versions don't like blank lines in lua macros. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.sZDhR1/_old 2026-03-01 22:14:34.369341929 +0100 +++ /var/tmp/diff_new_pack.sZDhR1/_new 2026-03-01 22:14:34.373342094 +0100 @@ -1,6 +1,6 @@ -mtime: 1762129307 -commit: 521e3b1dc4df1038c5dbf9a8b71c2a16fcd44edd1bb7e3027630f6fc0d491129 +mtime: 1772242587 +commit: bb5f958d9babafe6a8e7cd525e27f83c1cb753426187fb6397290bd8864ff8b2 url: https://src.opensuse.org/lua/lua-macros.git -revision: 521e3b1dc4df1038c5dbf9a8b71c2a16fcd44edd1bb7e3027630f6fc0d491129 +revision: bb5f958d9babafe6a8e7cd525e27f83c1cb753426187fb6397290bd8864ff8b2 projectscmsync: https://src.opensuse.org/lua/_ObsPrj.git ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-02-28 02:36:48.000000000 +0100 @@ -0,0 +1,9 @@ +.osc +_scmsync.obsinfo +_buildconfig-* +_buildinfo-*.xml +lua-macros-*-build/ +*.obscpio +*.osc +_build.* +.pbuild diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/install-lua-rock.sh new/install-lua-rock.sh --- old/install-lua-rock.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/install-lua-rock.sh 2026-02-28 02:36:48.000000000 +0100 @@ -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 ++++++ macros.lua ++++++ --- /var/tmp/diff_new_pack.sZDhR1/_old 2026-03-01 22:14:34.549349327 +0100 +++ /var/tmp/diff_new_pack.sZDhR1/_new 2026-03-01 22:14:34.557349656 +0100 @@ -13,6 +13,16 @@ local nodots = ver:gsub("%.", "") print(nodots) } + +%lua_value %{lua: +local flavor = rpm.expand("%{flavor}") +if flavor == "luajit" then + print("52") +else + print((flavor:gsub("lua", ""))) +end +} + # compiled modules should go here %lua_archdir %{lua: local handle = io.popen("pkgconf --variable=INSTALL_CMOD lua 2>/dev/null") @@ -21,6 +31,7 @@ result = result:gsub("^%s*(.-)%s*$", "%1") print(result) } + # pure Lua modules should go here %lua_noarchdir %{lua: local output = "" @@ -35,6 +46,7 @@ end print(rpm.expand("%{_datadir}/lua/%{lua_version}")) } + # lua includes folder %lua_incdir %{lua: local handle = io.popen("pkgconf --variable=includedir lua 2>/dev/null") @@ -43,6 +55,7 @@ result = result:gsub("^%s*(.-)%s*$", "%1") print(result) } + %lua_version_default %{lua: local result = "5.4" local ver = rpm.expand("%{?suse_version}") @@ -56,12 +69,23 @@ end print(result) } + # Define a conditional that evaluates true when building for the default Lua version %lua_version_default_nodots %{lua: local ver = rpm.expand("%{lua_version_default}") local nodots = ver:gsub("%.", "") print(nodots) } + +%lua_exec %{lua: + local flavor = rpm.expand("%{flavor}") + if flavor == "luajit" then + print("luajit") + else + print("lua" .. rpm.expand("%{lua_version}")) + end +} + # Lua default version # This REQUIRES macro %%{mod_name} to be defined. # -e: Exclude lua prefix @@ -73,12 +97,13 @@ return end +-- local lua_ver_nodots = rpm.expand("%{lua_version_nodots}") local lua_ver_default_nodots = rpm.expand("%{lua_version_default_nodots}") local flavor = rpm.expand("%{flavor}") local version = rpm.expand("%{version}") local release = rpm.expand("%{release}") - +-- local provides_name if rpm.expand("%{-n*}") ~= "" then provides_name = rpm.expand("%{-n*}") @@ -87,12 +112,12 @@ else provides_name = "lua-" .. mod_name end - +-- if lua_ver_nodots == lua_ver_default_nodots then print("Provides: " .. provides_name .. " = " .. version .. "-" .. release .. "\\n") print("Obsoletes: " .. provides_name .. " < " .. version .. "-" .. release .. "\\n") end - +-- if flavor == "luajit" then print("Obsoletes: lua51-" .. mod_name .. " <= " .. version .. "-" .. release .. "\\n") end @@ -107,3 +132,7 @@ %luarocks_install \ %{_rpmconfigdir}/install-lua-rock.sh "%{lua_version}" "%{buildroot}%{_prefix}" "%{buildroot}%{luarocks_treedir}/%{mod_name}" +%alternatives_requires_exclude() %{global __requires_exclude ^/usr/bin/lua(5\\.[1-9]|jit)?$} + +# vi: ft=spec +
