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
@@ -21,4 +22,3 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
-*.changes merge=merge-changes

.gitignore

@@ -1,9 +1 @@
 .osc
-_scmsync.obsinfo
-_buildconfig-*
-_buildinfo-*.xml
-lua-macros-*-build/
-*.obscpio
-*.osc
-_build.*
-.pbuild

install-lua-rock.sh

@@ -1,15 +0,0 @@
-#!/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

lua-macros.changes

@@ -1,16 +1,3 @@
--------------------------------------------------------------------
-Mon Nov  3 00:20:49 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
-
-- Finally broke %lua_provides to be working. I got stumped by the
-  craziness of rpm which runs Lua interpreter with locales and
-  crazy reformatting of integers.
-
--------------------------------------------------------------------
-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>
 

lua-macros.spec

@@ -27,7 +27,6 @@ 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
@@ -35,6 +34,9 @@ Requires:       lua-interpreter
 Requires:       lua
 %endif
 Requires:       pkgconfig
+%if "%_vendor" != "debbuild"
+ExclusiveArch:  do_not_build
+%endif
 BuildArch:      noarch
 
 %description
@@ -47,11 +49,9 @@ cp -p %{SOURCE0} .
 :
 
 %install
-install -Dm644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/macros.lua
-install -Dm755 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/install-lua-rock.sh
+install -Dm644 macros.lua %{buildroot}%{_rpmmacrodir}/macros.lua
 
 %files
 %{_rpmmacrodir}/macros.lua
-%{_rpmconfigdir}/install-lua-rock.sh
 
 %changelog

macros.lua

@@ -44,14 +44,14 @@ print(rpm.expand("%{_datadir}/lua/%{lua_version}"))
   print(result)
 }
 %lua_version_default %{lua:
-local result = "5.4"
+local result = 5.4
 local ver = rpm.expand("%{?suse_version}")
 if #ver > 0 then
     ver = tonumber(ver)
     if ver < 1500 then
-        result = "5.1"
+        result = 5.1
     elseif ver < 1600 then
-        result = "5.3"
+        result = 5.3
     end
 end
 print(result)
@@ -63,39 +63,31 @@ print(result)
   print(nodots)
 }
 # Lua default version
-# This REQUIRES macro %%{mod_name} to be defined.
+# This REQUIRES macro %{mod_name} to be defined.
 # -e: Exclude lua prefix
 # -n: Specify name
 %lua_provides(en:) %{lua:
 local mod_name = rpm.expand("%{?mod_name}")
-if mod_name == "" or mod_name == "%{?mod_name}" then
-    print("-- Error: %%{mod_name} is not defined!")
+if mod_name == "" then
+    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}")
-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*}")
-elseif rpm.expand("%{-e:1}") == "1" then
-    provides_name = mod_name
-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
+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
@@ -105,4 +97,7 @@ 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}"
+  /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' --