From 7525e0fc064ba26f3e009fbdac5b7fc19826996244fead3438b99823b18e547b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 12 Oct 2025 20:21:25 +0000 Subject: [PATCH] Accepting request 1310405 from devel:languages:lua - Make definition of variables dynamic based on pkgconf output. OBS-URL: https://build.opensuse.org/request/show/1310405 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lua-macros?expand=0&rev=11 --- _scmsync.obsinfo | 6 +++--- build.specials.obscpio | 4 ++-- lua-macros.changes | 5 +++++ lua-macros.spec | 1 + macros.lua | 6 +++--- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 4ce1e32..c731877 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,5 +1,5 @@ -mtime: 1754402745 -commit: efd19cb701415d2f476cfd403552a97597ea8c2fd08ecd1d651320e2eb45e956 +mtime: 1760049853 +commit: db9766d6bd3427a28de3d6839f6f471ed86e6ae894bd85374497c35a2cc5dcdf url: https://src.opensuse.org/lua/lua-macros.git -revision: efd19cb701415d2f476cfd403552a97597ea8c2fd08ecd1d651320e2eb45e956 +revision: db9766d6bd3427a28de3d6839f6f471ed86e6ae894bd85374497c35a2cc5dcdf projectscmsync: https://src.opensuse.org/lua/_ObsPrj.git diff --git a/build.specials.obscpio b/build.specials.obscpio index 55b09d0..a8b7da5 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:039225a571b2f5fcb2156e906265c3cde5afc9e477b2da34c1a3584b98a4e42c -size 324 +oid sha256:bb8d0d04e489936d74eadfd3bc50ccbaa57586c04545ff9d63b2e07f0f01283a +size 356 diff --git a/lua-macros.changes b/lua-macros.changes index e3d8c33..7283f75 100644 --- a/lua-macros.changes +++ b/lua-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 9 22:44:04 UTC 2025 - Matej Cepl + +- Make definition of variables dynamic based on pkgconf output. + ------------------------------------------------------------------- Tue Aug 5 14:05:41 UTC 2025 - Matej Cepl diff --git a/lua-macros.spec b/lua-macros.spec index 447d93b..ad90da4 100644 --- a/lua-macros.spec +++ b/lua-macros.spec @@ -33,6 +33,7 @@ Requires: lua-interpreter # on SLE 12 lua is lua5.2 unconditionally, avoid Requires: lua %endif +Requires: pkgconfig BuildArch: noarch %description diff --git a/macros.lua b/macros.lua index 4720675..5c23f1f 100644 --- a/macros.lua +++ b/macros.lua @@ -5,13 +5,13 @@ %lua_version_nodots %(lua -e 'print((string.gsub("%{lua_version}", "%.", "")))') # compiled modules should go here -%lua_archdir %{_libdir}/lua/%{lua_version} +%lua_archdir %(pkgconf --variable=INSTALL_CMOD lua) # pure Lua modules should go here -%lua_noarchdir %{_datadir}/lua/%{lua_version} +%lua_noarchdir %(pkgconf --variable=INSTALL_LMOD lua) # lua includes folder -%lua_incdir %{_includedir}/lua%{lua_version} +%lua_incdir %(pkgconf --variable=includedir lua) %lua_version_default %{lua: local result = 5.4