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-10-26 09:57:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua-macros (Old) and /work/SRC/openSUSE:Factory/.lua-macros.new.2252680 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua-macros" Mon Oct 26 09:57:46 2026 rev:17 rq:1392251 version:20210827 Changes: -------- --- /work/SRC/openSUSE:Factory/lua-macros/lua-macros.changes 2026-03-01 22:14:33.517306912 +0100 +++ /work/SRC/openSUSE:Factory/.lua-macros.new.2252680/lua-macros.changes 2026-10-26 09:57:48.521190415 +0100 @@ -1,0 +2,19 @@ +Wed Jul 22 13:01:55 UTC 2026 - Michal Suchanek <[email protected]> + +- Fix build on SLE15 + - rpm on SLE15 does not like %%{global name ...}, remove superfluous {} + +------------------------------------------------------------------- +Tue Jul 21 17:16:27 UTC 2026 - Michal Suchanek <[email protected]> + +- Fix build on SLE12 + - SLE12 and SLE15 rpm does not like empty lines in lua macros. Drop. + - pkgconf and pkgconfig are distinct binaries. lua-macros depend on pkgconfig + but call pkgconf. Correct the calls to use the older binary name. + +------------------------------------------------------------------- +Tue Jul 21 17:14:23 UTC 2026 - Michal Suchanek <[email protected]> + +- Fix lua-interpreter dependency condition (bsc#1272140) + +------------------------------------------------------------------- New: ---- install-lua-rock.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua-macros.spec ++++++ --- /var/tmp/diff_new_pack.lxuX8E/_old 2026-10-26 09:57:49.744241725 +0100 +++ /var/tmp/diff_new_pack.lxuX8E/_new 2026-10-26 09:57:49.746241809 +0100 @@ -1,7 +1,7 @@ # # spec file for package lua-macros # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ URL: https://www.lua.org Source0: macros.lua Source1: install-lua-rock.sh -%if 0%{?suse_version} > 1600 +%if 0%{?suse_version} >= 1699 Requires: lua-interpreter %elif 0%{?suse_version} >= 1500 # on SLE 12 lua is lua5.2 unconditionally, avoid ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.lxuX8E/_old 2026-10-26 09:57:49.796243907 +0100 +++ /var/tmp/diff_new_pack.lxuX8E/_new 2026-10-26 09:57:49.799244033 +0100 @@ -1,6 +1,6 @@ -mtime: 1772242587 -commit: bb5f958d9babafe6a8e7cd525e27f83c1cb753426187fb6397290bd8864ff8b2 -url: https://src.opensuse.org/lua/lua-macros.git -revision: bb5f958d9babafe6a8e7cd525e27f83c1cb753426187fb6397290bd8864ff8b2 +mtime: 1784727737 +commit: 14ef879043755a57ac16834cf348534455c757b63f2135ff04d8d5efa044f880 +url: https://src.opensuse.org/lua/lua-macros +revision: 14ef879043755a57ac16834cf348534455c757b63f2135ff04d8d5efa044f880 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-07-22 15:42:17.000000000 +0200 @@ -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-07-22 15:42:17.000000000 +0200 @@ -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 ++++++ install-lua-rock.sh ++++++ #!/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.lxuX8E/_old 2026-10-26 09:57:49.976251458 +0100 +++ /var/tmp/diff_new_pack.lxuX8E/_new 2026-10-26 09:57:49.982251710 +0100 @@ -25,7 +25,7 @@ # compiled modules should go here %lua_archdir %{lua: - local handle = io.popen("pkgconf --variable=INSTALL_CMOD lua 2>/dev/null") + local handle = io.popen("pkg-config --variable=INSTALL_CMOD lua 2>/dev/null") local result = handle:read("*a") handle:close() result = result:gsub("^%s*(.-)%s*$", "%1") @@ -35,7 +35,7 @@ # pure Lua modules should go here %lua_noarchdir %{lua: local output = "" -local f = io.popen("pkgconf --variable=INSTALL_LMOD lua 2>/dev/null") +local f = io.popen("pkg-config --variable=INSTALL_LMOD lua 2>/dev/null") if f ~= nil then output = f:read("*a"):gsub("^%s*(.-)%s*$", "%1") f:close() @@ -49,7 +49,7 @@ # lua includes folder %lua_incdir %{lua: - local handle = io.popen("pkgconf --variable=includedir lua 2>/dev/null") + local handle = io.popen("pkg-config --variable=includedir lua 2>/dev/null") local result = handle:read("*a") handle:close() result = result:gsub("^%s*(.-)%s*$", "%1") @@ -96,7 +96,6 @@ print("-- Error: %%{mod_name} is not defined!") return end - -- local lua_ver_nodots = rpm.expand("%{lua_version_nodots}") local lua_ver_default_nodots = rpm.expand("%{lua_version_default_nodots}") @@ -132,7 +131,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)?$} +%alternatives_requires_exclude() %global __requires_exclude ^/usr/bin/lua(5\\.[1-9]|jit)?$ # vi: ft=spec
