forked from pool/lua-macros
Compare commits
14 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
|
521e3b1dc4
|
|||
|
d1f0f1035b
|
|||
|
60b20c88fb
|
|||
|
6e7d7d058f
|
|||
|
8ee4d34fad
|
|||
|
c1d442702b
|
|||
|
d4f21b0c0c
|
|||
|
984b4bf4f2
|
|||
|
21cfcf02e2
|
|||
|
22fe4289a4
|
|||
|
db9766d6bd
|
|||
|
df6ced835e
|
|||
|
efd19cb701
|
|||
|
91f3720965
|
4
.gitattributes
vendored
4
.gitattributes
vendored
@@ -1,4 +1,4 @@
|
|||||||
*.changes merge=merge-changes
|
## Default LFS
|
||||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
@@ -12,7 +12,6 @@
|
|||||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
*.png filter=lfs diff=lfs merge=lfs -text
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
*.rpm 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
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
@@ -22,3 +21,4 @@
|
|||||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.changes merge=merge-changes
|
||||||
|
|||||||
8
.gitignore
vendored
8
.gitignore
vendored
@@ -1 +1,9 @@
|
|||||||
.osc
|
.osc
|
||||||
|
_scmsync.obsinfo
|
||||||
|
_buildconfig-*
|
||||||
|
_buildinfo-*.xml
|
||||||
|
lua-macros-*-build/
|
||||||
|
*.obscpio
|
||||||
|
*.osc
|
||||||
|
_build.*
|
||||||
|
.pbuild
|
||||||
|
|||||||
15
install-lua-rock.sh
Executable file
15
install-lua-rock.sh
Executable file
@@ -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
|
||||||
@@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
Tue Oct 14 23:16:09 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ License: MIT
|
|||||||
Group: Development/Languages/Other
|
Group: Development/Languages/Other
|
||||||
URL: https://www.lua.org
|
URL: https://www.lua.org
|
||||||
Source0: macros.lua
|
Source0: macros.lua
|
||||||
|
Source1: install-lua-rock.sh
|
||||||
%if 0%{?suse_version} > 1600
|
%if 0%{?suse_version} > 1600
|
||||||
Requires: lua-interpreter
|
Requires: lua-interpreter
|
||||||
%elif 0%{?suse_version} >= 1500
|
%elif 0%{?suse_version} >= 1500
|
||||||
@@ -34,9 +35,6 @@ Requires: lua-interpreter
|
|||||||
Requires: lua
|
Requires: lua
|
||||||
%endif
|
%endif
|
||||||
Requires: pkgconfig
|
Requires: pkgconfig
|
||||||
%if "%_vendor" != "debbuild"
|
|
||||||
ExclusiveArch: do_not_build
|
|
||||||
%endif
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@@ -49,9 +47,11 @@ cp -p %{SOURCE0} .
|
|||||||
:
|
:
|
||||||
|
|
||||||
%install
|
%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
|
%files
|
||||||
%{_rpmmacrodir}/macros.lua
|
%{_rpmmacrodir}/macros.lua
|
||||||
|
%{_rpmconfigdir}/install-lua-rock.sh
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
57
macros.lua
57
macros.lua
@@ -44,14 +44,14 @@ print(rpm.expand("%{_datadir}/lua/%{lua_version}"))
|
|||||||
print(result)
|
print(result)
|
||||||
}
|
}
|
||||||
%lua_version_default %{lua:
|
%lua_version_default %{lua:
|
||||||
local result = 5.4
|
local result = "5.4"
|
||||||
local ver = rpm.expand("%{?suse_version}")
|
local ver = rpm.expand("%{?suse_version}")
|
||||||
if #ver > 0 then
|
if #ver > 0 then
|
||||||
ver = tonumber(ver)
|
ver = tonumber(ver)
|
||||||
if ver < 1500 then
|
if ver < 1500 then
|
||||||
result = 5.1
|
result = "5.1"
|
||||||
elseif ver < 1600 then
|
elseif ver < 1600 then
|
||||||
result = 5.3
|
result = "5.3"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
print(result)
|
print(result)
|
||||||
@@ -63,31 +63,39 @@ print(result)
|
|||||||
print(nodots)
|
print(nodots)
|
||||||
}
|
}
|
||||||
# Lua default version
|
# Lua default version
|
||||||
# This REQUIRES macro %{mod_name} to be defined.
|
# This REQUIRES macro %%{mod_name} to be defined.
|
||||||
# -e: Exclude lua prefix
|
# -e: Exclude lua prefix
|
||||||
# -n: Specify name
|
# -n: Specify name
|
||||||
%lua_provides(en:) %{lua:
|
%lua_provides(en:) %{lua:
|
||||||
local mod_name = rpm.expand("%{?mod_name}")
|
local mod_name = rpm.expand("%{?mod_name}")
|
||||||
if mod_name == "" then
|
if mod_name == "" or mod_name == "%{?mod_name}" then
|
||||||
print("-- Error: %{mod_name} is not defined!")
|
print("-- Error: %%{mod_name} is not defined!")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
print([[
|
|
||||||
%if "%{lua_version_nodots}" == "%{lua_version_default_nodots}"
|
local lua_ver_nodots = rpm.expand("%{lua_version_nodots}")
|
||||||
%if 0%{?-n:1}
|
local lua_ver_default_nodots = rpm.expand("%{lua_version_default_nodots}")
|
||||||
Provides: %{-n*} = %{version}-%{release}
|
local flavor = rpm.expand("%{flavor}")
|
||||||
Obsoletes: %{-n*} < %{version}-%{release}
|
local version = rpm.expand("%{version}")
|
||||||
%else
|
local release = rpm.expand("%{release}")
|
||||||
%if 0%{?-e:1}
|
|
||||||
Provides: %{mod_name} = %{version}-%{release}
|
local provides_name
|
||||||
Obsoletes: %{mod_name} < %{version}-%{release}
|
if rpm.expand("%{-n*}") ~= "" then
|
||||||
%else
|
provides_name = rpm.expand("%{-n*}")
|
||||||
Provides: lua-%{mod_name} = %{version}-%{release}
|
elseif rpm.expand("%{-e:1}") == "1" then
|
||||||
Obsoletes: lua-%{mod_name} < %{version}-%{release}
|
provides_name = mod_name
|
||||||
%endif
|
else
|
||||||
%endif
|
provides_name = "lua-" .. mod_name
|
||||||
%endif
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
# LuaRocks
|
# LuaRocks
|
||||||
@@ -97,7 +105,4 @@ luarocks --lua-version "%{lua_version}" make --deps-mode none --pack-binary-rock
|
|||||||
%luarocks_treedir %{_prefix}/lib/luarocks/rocks-%{lua_version}
|
%luarocks_treedir %{_prefix}/lib/luarocks/rocks-%{lua_version}
|
||||||
|
|
||||||
%luarocks_install \
|
%luarocks_install \
|
||||||
/bin/sh -c 'luarocks --lua-version="%{lua_version}" --tree="%{buildroot}%{_prefix}" install --deps-mode=none --no-manifest "$@" && \
|
%{_rpmconfigdir}/install-lua-rock.sh "%{lua_version}" "%{buildroot}%{_prefix}" "%{buildroot}%{luarocks_treedir}/%{mod_name}"
|
||||||
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' --
|
|
||||||
|
|||||||
Reference in New Issue
Block a user