Revert "Fake commit for testing"

This reverts commit 1decb6c307.

.gitattributes

@@ -1,4 +1,4 @@
-## Default LFS
+*.changes merge=merge-changes
 *.7z filter=lfs diff=lfs merge=lfs -text
 *.bsp filter=lfs diff=lfs merge=lfs -text
 *.bz2 filter=lfs diff=lfs merge=lfs -text
@@ -12,6 +12,7 @@
 *.pdf filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
 *.rpm filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
 *.tbz filter=lfs diff=lfs merge=lfs -text
 *.tbz2 filter=lfs diff=lfs merge=lfs -text
 *.tgz filter=lfs diff=lfs merge=lfs -text

_scmsync.obsinfo

@@ -1,5 +0,0 @@
-mtime: 1760224634
-commit: 984b4bf4f2aada9069ea10fd24cedbfd7304d1b1bc74d792201a56543a747683
-url: https://src.opensuse.org/lua/lua-macros.git
-revision: 984b4bf4f2aada9069ea10fd24cedbfd7304d1b1bc74d792201a56543a747683
-projectscmsync: https://src.opensuse.org/lua/_ObsPrj.git

build.specials.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f0dab0a704216725773db8af2af8e8f5bcdd83271b6ca6bb810062d99a0be44
-size 356

lua-macros.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+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>
 

lua-macros.spec

@@ -34,6 +34,9 @@ Requires:       lua-interpreter
 Requires:       lua
 %endif
 Requires:       pkgconfig
+%if "%_vendor" != "debbuild"
+ExclusiveArch:  do_not_build
+%endif
 BuildArch:      noarch
 
 %description

macros.lua

@@ -13,31 +13,36 @@ print(ver)
   local nodots = ver:gsub("%.", "")
   print(nodots)
 }
-
 # compiled modules should go here
-%lua_archdir %(pkgconf --variable=INSTALL_CMOD lua)
+%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 %{lua:
 local output = ""
-local f = io.popen("pkgconf --variable=INSTALL_LMOD lua")
+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 %(pkgconf --variable=includedir lua)
+%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}")
@@ -45,46 +50,54 @@ 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}", "%.", "")))')
+# Define a conditional that evaluates true when building for the default Lua version
-
+%lua_version_default_nodots %{lua:
-%ifluadefault \
+  local ver = rpm.expand("%{lua_version_default}")
-%if %{lua_version_nodots} == %{lua_version_default_nodots} \
+  local nodots = ver:gsub("%.", "")
-%{nil}
+  print(nodots)
-
+}
 # Lua default version
 # This REQUIRES macro %{mod_name} to be defined.
 # -e: Exclude lua prefix
 # -n: Specify name
-%lua_provides(en:) \
+%lua_provides(en:) %{lua:
-%ifluadefault \
+local mod_name = rpm.expand("%{?mod_name}")
-%if 0%{?-n:1} \
+if mod_name == "" then
-Provides: %{-n*} = %{version}-%{release} \
+    print("-- Error: %{mod_name} is not defined!")
-Obsoletes: %{-n*} < %{version}-%{release} \
+    return
-%else \
+end
-%if 0%{?-e:1} \
+print([[
-Provides: %{mod_name} = %{version}-%{release} \
+%if "%{lua_version_nodots}" == "%{lua_version_default_nodots}"
-Obsoletes: %{mod_name} < %{version}-%{release} \
+%if 0%{?-n:1}
-%else \
+Provides: %{-n*} = %{version}-%{release}
-Provides: lua-%{mod_name} = %{version}-%{release} \
+Obsoletes: %{-n*} < %{version}-%{release}
-Obsoletes: lua-%{mod_name} < %{version}-%{release} \
+%else
-%endif \
+%if 0%{?-e:1}
-%endif \
+Provides: %{mod_name} = %{version}-%{release}
-%endif \
+Obsoletes: %{mod_name} < %{version}-%{release}
-%{nil}
+%else
+Provides: lua-%{mod_name} = %{version}-%{release}
+Obsoletes: lua-%{mod_name} < %{version}-%{release}
+%endif
+%endif
+%endif
+]])
+}
 
 # LuaRocks
 %luarocks_build \
-luarocks --lua-version "%{lua_version}" \\\
+luarocks --lua-version "%{lua_version}" make --deps-mode none --pack-binary-rock
-make --pack-binary-rock --deps-mode none
-
-%luarocks_install \
-luarocks --lua-version="%{lua_version}" --tree="%{buildroot}%{_prefix}" \\\
-install --deps-mode=none --no-manifest
 
 %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' --