Accepting request 1312655 from devel:languages:lua

- Rewrite %luarocks_install to use a shell script
  install-lua-rock.sh, which is packaged as well.

OBS-URL: https://build.opensuse.org/request/show/1312655
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lua-macros?expand=0&rev=14

Makefile

@@ -0,0 +1,18 @@
+all:
+	mkdir -p build && cd build/ \
+	&& cmake .. \
+		'-GUnix Makefiles' \
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo '-DCMAKE_C_FLAGS=-O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g' \
+		'-DCMAKE_EXE_LINKER_FLAGS=-flto=auto -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now' \
+		'-DCMAKE_MODULE_LINKER_FLAGS=-flto=auto -Wl,--as-needed' \
+		'-DCMAKE_SHARED_LINKER_FLAGS=-flto=auto -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now' \
+		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+		-DBUILD_SHARED_LIBS:BOOL=ON \
+		-DCMAKE_COLOR_MAKEFILE:BOOL=OFF \
+		-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+		-DLUA_INCLUDE_DIR:PATH=$(shell pkgconf --variable=includedir lua) \
+	&& make
+
+clean:
+	rm -rf build CMakeCache.txt

_scmsync.obsinfo

@@ -1,5 +1,5 @@
-mtime: 1754402745
-commit: efd19cb701415d2f476cfd403552a97597ea8c2fd08ecd1d651320e2eb45e956
+mtime: 1760999899
+commit: d1f0f1035bb04d30b4b3f2362fd2a8fa757179cdb184b24e5b6d27f1245ff673
 url: https://src.opensuse.org/lua/lua-macros.git
-revision: efd19cb701415d2f476cfd403552a97597ea8c2fd08ecd1d651320e2eb45e956
+revision: d1f0f1035bb04d30b4b3f2362fd2a8fa757179cdb184b24e5b6d27f1245ff673
 projectscmsync: https://src.opensuse.org/lua/_ObsPrj.git

lua-macros.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Mon Oct 20 21:30:36 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- 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 <mcepl@cepl.eu>
+
+- Fix %luarocks_* macros.
+
+-------------------------------------------------------------------
+Mon Oct 13 20:24:01 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Fix %%lua_provides.
+
+-------------------------------------------------------------------
+Mon Oct 13 17:20:42 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Quote %%lua_archdir macro.
+
+-------------------------------------------------------------------
+Sat Oct 11 16:45:06 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Rework Lua version and path macros using RPM Lua blocks.
+
+-------------------------------------------------------------------
+Fri Oct 10 10:56:01 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Make %{lua_noarchdir} work even without lua-devel installed.
+
+-------------------------------------------------------------------
+Thu Oct  9 22:44:04 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Make definition of variables dynamic based on pkgconf output.
+
 -------------------------------------------------------------------
 Tue Aug  5 14:05:41 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
 

lua-macros.spec

@@ -27,12 +27,14 @@ 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
 # on SLE 12 lua is lua5.2 unconditionally, avoid
 Requires:       lua
 %endif
+Requires:       pkgconfig
 BuildArch:      noarch
 
 %description
@@ -45,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

macros.lua

@@ -1,18 +1,48 @@
 # RPM macros for Lua
 
 # The major.minor version of Lua
-%lua_version %(lua -e 'print(_VERSION)' | cut -d ' ' -f 2)
-%lua_version_nodots %(lua -e 'print((string.gsub("%{lua_version}", "%.", "")))')
-
+%lua_version %{lua:
+local f = io.popen("lua -e 'print(_VERSION)'")
+local output = f:read("*a")
+f:close()
+local ver = output:match("Lua (%d%.%d)")
+print(ver)
+}
+%lua_version_nodots %{lua:
+  local ver = rpm.expand("%{lua_version}")
+  local nodots = ver:gsub("%.", "")
+  print(nodots)
+}
 # compiled modules should go here
-%lua_archdir %{_libdir}/lua/%{lua_version}
-
+%lua_archdir %{lua:
+  local handle = io.popen("pkgconf --variable=INSTALL_CMOD lua 2>/dev/null")
+  local result = handle:read("*a")
+  handle:close()
+  result = result:gsub("^%s*(.-)%s*$", "%1")
+  print(result)
+}
 # pure Lua modules should go here
-%lua_noarchdir %{_datadir}/lua/%{lua_version}
-
+%lua_noarchdir %{lua:
+local output = ""
+local f = io.popen("pkgconf --variable=INSTALL_LMOD lua 2>/dev/null")
+if f ~= nil then
+    output = f:read("*a"):gsub("^%s*(.-)%s*$", "%1")
+    f:close()
+end
+if output:len() > 0 then
+    print(output)
+    return
+end
+print(rpm.expand("%{_datadir}/lua/%{lua_version}"))
+}
 # lua includes folder
-%lua_incdir %{_includedir}/lua%{lua_version}
-
+%lua_incdir %{lua:
+  local handle = io.popen("pkgconf --variable=includedir lua 2>/dev/null")
+  local result = handle:read("*a")
+  handle:close()
+  result = result:gsub("^%s*(.-)%s*$", "%1")
+  print(result)
+}
 %lua_version_default %{lua:
 local result = 5.4
 local ver = rpm.expand("%{?suse_version}")
@@ -20,45 +50,51 @@ if #ver > 0 then
     ver = tonumber(ver)
     if ver < 1500 then
         result = 5.1
-    elseif ver == 1500 then
+    elseif ver < 1600 then
         result = 5.3
     end
 end
 print(result)
 }
-%lua_version_default_nodots %(lua -e 'print((string.gsub("%{lua_version_default}", "%.", "")))')
-
-%ifluadefault \
-%if %{lua_version_nodots} == %{lua_version_default_nodots} \
-%{nil}
-
+# 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 default version
+# This REQUIRES macro %{mod_name} to be defined.
 # -e: Exclude lua prefix
 # -n: Specify name
-%lua_provides(en:) \
-%ifluadefault \
-%if 0%{?-n:1} \
-Provides: %{-n*} = %{version}-%{release} \
-Obsoletes: %{-n*} < %{version}-%{release} \
-%else \
-%if 0%{?-e:1} \
-Provides: %{mod_name} = %{version}-%{release} \
-Obsoletes: %{mod_name} < %{version}-%{release} \
-%else \
-Provides: lua-%{mod_name} = %{version}-%{release} \
-Obsoletes: lua-%{mod_name} < %{version}-%{release} \
-%endif \
-%endif \
-%endif \
-%{nil}
+%lua_provides(en:) %{lua:
+local mod_name = rpm.expand("%{?mod_name}")
+if mod_name == "" then
+    print("-- Error: %{mod_name} is not defined!")
+    return
+end
+print([[
+%if "%{lua_version_nodots}" == "%{lua_version_default_nodots}"
+%if 0%{?-n:1}
+Provides: %{-n*} = %{version}-%{release}
+Obsoletes: %{-n*} < %{version}-%{release}
+%else
+%if 0%{?-e:1}
+Provides: %{mod_name} = %{version}-%{release}
+Obsoletes: %{mod_name} < %{version}-%{release}
+%else
+Provides: lua-%{mod_name} = %{version}-%{release}
+Obsoletes: lua-%{mod_name} < %{version}-%{release}
+%endif
+%endif
+%endif
+]])
+}
 
 # LuaRocks
 %luarocks_build \
-luarocks --lua-version "%{lua_version}" \\\
-make --pack-binary-rock --deps-mode none
-
-%luarocks_install \
-luarocks --lua-version="%{lua_version}" --tree="%{buildroot}%{_prefix}" \\\
-install --deps-mode=none --no-manifest
+luarocks --lua-version "%{lua_version}" make --deps-mode none --pack-binary-rock
 
 %luarocks_treedir %{_prefix}/lib/luarocks/rocks-%{lua_version}
+
+%luarocks_install \
+  %{_rpmconfigdir}/install-lua-rock.sh "%{lua_version}" "%{buildroot}%{_prefix}" "%{buildroot}%{luarocks_treedir}/%{mod_name}"