Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lua54 for openSUSE:Factory checked in at 2025-08-03 13:35:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua54 (Old) and /work/SRC/openSUSE:Factory/.lua54.new.1085 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua54" Sun Aug 3 13:35:52 2025 rev:33 rq:1296995 version:5.4.8 Changes: -------- --- /work/SRC/openSUSE:Factory/lua54/lua54.changes 2025-07-15 16:43:15.098522979 +0200 +++ /work/SRC/openSUSE:Factory/.lua54.new.1085/lua54.changes 2025-08-03 13:35:56.767807335 +0200 @@ -1,0 +2,9 @@ +Sat Jul 19 09:23:33 UTC 2025 - Matej Cepl <[email protected]> + +- Switch from update-alternatives to libalternatives (and + dependency on lua-interpreter) +- improve .gitignore and overall improve the packaging. +- this package also provides devel symlink directly and conflicts + other -devel packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua54.spec ++++++ --- /var/tmp/diff_new_pack.9AQvLq/_old 2025-08-03 13:35:57.871852997 +0200 +++ /var/tmp/diff_new_pack.9AQvLq/_new 2025-08-03 13:35:57.871852997 +0200 @@ -25,6 +25,11 @@ %endif %define major_version 5.4 %define libname liblua5_4-5 +%if 0%{?suse_version} > 1500 +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif Name: lua54%{name_ext} Version: 5.4.8 Release: 0 @@ -46,15 +51,24 @@ # PATCH-FIX-UPSTREAM inspect errno only after failure Patch8: execresult.patch Patch100: upstream1.patch -Requires(post): update-alternatives -Requires(postun):update-alternatives +Conflicts: lua Provides: lua = %{version} Obsoletes: lua < %{version} Provides: Lua(API) = %{major_version} +%if %{with libalternatives} +BuildRequires: alts +BuildRequires: lua-interpreter +Requires: alts +Requires: lua-interpreter +%else +Requires(post): update-alternatives +Requires(postun): update-alternatives +%endif %if "%{flavor}" == "test" BuildRequires: lua54 BuildRequires: lua54-devel %else +#!BuildIgnore: lua54 BuildRequires: libtool BuildRequires: lua-macros BuildRequires: pkgconfig @@ -75,13 +89,11 @@ %package devel Summary: Development files for lua -License: MIT Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} Requires: %{name} = %{version} Requires: lua-macros -Requires(post): update-alternatives -Requires(postun):update-alternatives +Conflicts: lua-devel Provides: lua-devel = %{version} Provides: Lua(devel) = %{major_version} Provides: pkgconfig(lua) = %{version} @@ -96,7 +108,6 @@ %package -n %{libname} Summary: The Lua integration library -License: MIT Group: System/Libraries Provides: liblua5_4 = %{version}-%{release} Obsoletes: liblua5_4 < %{version}-%{release} @@ -123,7 +134,6 @@ %package doc Summary: Documentation for Lua, a small embeddable language -License: MIT Group: Documentation/HTML BuildArch: noarch %if 0%{?suse_version} > 1315 @@ -151,8 +161,10 @@ %if "%{flavor}" != "test" cat doc/lua.1 | sed 's/TH LUA 1/TH LUA%{major_version} 1/' > doc/lua%{major_version}.1 cat doc/luac.1 | sed 's/TH LUAC 1/TH LUAC%{major_version} 1/' > doc/luac%{major_version}.1 +%endif %build +%if "%{flavor}" != "test" sed -i -e "s@lib/lua/@%{_lib}/lua/@g" src/luaconf.h %make_build linux-readline -C src \ CC="cc" LIBDIR="%{_libdir}" \ @@ -184,9 +196,21 @@ Libs: -llua%{major_version} -lm Cflags: -I\${includedir} EOF - install -D -m 644 lua%{major_version}.pc %{buildroot}%{_libdir}/pkgconfig/lua%{major_version}.pc +%if %{with libalternatives} +# alternatives - create configuration file +mkdir -p %{buildroot}%{_datadir}/libalternatives/lua +cat > %{buildroot}%{_datadir}/libalternatives/lua/54.conf <<EOF +binary=%{_bindir}/lua5.4 +man=lua5.4 +EOF +mkdir -p %{buildroot}%{_datadir}/libalternatives/luac +cat > %{buildroot}%{_datadir}/libalternatives/luac/54.conf <<EOF +binary=%{_bindir}/luac5.4 +man=luac5.4 +EOF +%else # update-alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives for file in lua luac ; do @@ -195,22 +219,23 @@ touch "%{buildroot}%{_sysconfdir}/alternatives/${file}.1%{ext_man}" ln -sf "%{_sysconfdir}/alternatives/${file}.1%{ext_man}" "%{buildroot}%{_mandir}/man1/${file}.1%{ext_man}" done +%endif # Compat link with older unprefixed library and with soname 0 from deb/etc ln -s %{_libdir}/liblua%{major_version}.so.%{major_version}.0 %{buildroot}%{_libdir}/liblua%{major_version}.so.%{major_version} ln -s %{_libdir}/liblua%{major_version}.so.%{major_version}.0 %{buildroot}%{_libdir}/liblua%{major_version}.so.0 ln -s %{_libdir}/liblua%{major_version}.so.%{major_version}.0 %{buildroot}%{_libdir}/liblua.so.%{major_version} -# Library devel alternatives -touch %{buildroot}%{_sysconfdir}/alternatives/liblua.so -ln -sf %{_sysconfdir}/alternatives/liblua.so %{buildroot}%{_libdir}/liblua.so -touch %{buildroot}%{_sysconfdir}/alternatives/lua.pc -ln -sf %{_sysconfdir}/alternatives/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc -%else + +# We don’t create alternatives for -devel content, just conflict those +ln -s %{_libdir}/liblua%{major_version}.so %{buildroot}%{_libdir}/liblua.so +ln -s %{_libdir}/pkgconfig/lua%{major_version}.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc +%endif # flavor != "test" %check +%if "%{flavor}" == "test" cd testes pushd libs -make all LUA_DIR=%{_includedir}/lua%{major_version} +%make_build all LUA_DIR=%{_includedir}/lua%{major_version} cp *.so .. popd LD_LIBRARY_PATH=%{_libdir} %{_bindir}/lua%{major_version} all.lua @@ -220,6 +245,7 @@ %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig +%if %{without libalternatives} %post %{_sbindir}/update-alternatives --install \ %{_bindir}/lua lua %{_bindir}/lua%{major_version} 54 \ @@ -231,18 +257,13 @@ if [ "$1" = 0 ] ; then %{_sbindir}/update-alternatives --remove lua %{_bindir}/lua%{major_version} fi +%endif -%post devel -%{_sbindir}/update-alternatives --install \ - %{_libdir}/liblua.so liblua.so %{_libdir}/liblua%{major_version}.so 54 \ - --slave %{_libdir}/pkgconfig/lua.pc lua.pc %{_libdir}/pkgconfig/lua%{major_version}.pc - -%postun devel -if [ "$1" = 0 ] ; then - %{_sbindir}/update-alternatives --remove liblua.so %{_libdir}/liblua%{major_version}.so -fi +%endif # flavor != "test" +%if "%{flavor}" != "test" %files +%doc README %dir %{_libdir}/lua %dir %{_libdir}/lua/%{major_version} %dir %{_datadir}/lua @@ -251,6 +272,10 @@ %{_bindir}/luac%{major_version} %{_mandir}/man1/lua%{major_version}.1%{?ext_man} %{_mandir}/man1/luac%{major_version}.1%{?ext_man} +%if %{with libalternatives} +%{_datadir}/libalternatives/lua/54.conf +%{_datadir}/libalternatives/luac/54.conf +%else # alternatives %{_bindir}/lua %{_bindir}/luac @@ -260,6 +285,7 @@ %ghost %{_sysconfdir}/alternatives/luac %ghost %{_sysconfdir}/alternatives/lua.1%{ext_man} %ghost %{_sysconfdir}/alternatives/luac.1%{ext_man} +%endif %files -n %{libname} %{_libdir}/liblua%{major_version}.so.* @@ -274,14 +300,10 @@ %{_includedir}/lua%{major_version}/lualib.h %{_libdir}/liblua%{major_version}.so %{_libdir}/pkgconfig/lua%{major_version}.pc -# alternatives %{_libdir}/liblua.so %{_libdir}/pkgconfig/lua.pc -%ghost %{_sysconfdir}/alternatives/liblua.so -%ghost %{_sysconfdir}/alternatives/lua.pc %files doc %doc doc/* - -%endif +%endif # flavor != "test" ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.9AQvLq/_old 2025-08-03 13:35:57.927855314 +0200 +++ /var/tmp/diff_new_pack.9AQvLq/_new 2025-08-03 13:35:57.927855314 +0200 @@ -1,6 +1,6 @@ -mtime: 1752346359 -commit: a815e81e871e1d8075894cf0ba9f282ec29dbcfa31de38778d86de75c55c98bc +mtime: 1754036263 +commit: 0fa5783653f81957fb929e456b70215c8cdf0e1d2ca6e83c48b987518f33bd78 url: https://src.opensuse.org/lua/lua54.git -revision: a815e81e871e1d8075894cf0ba9f282ec29dbcfa31de38778d86de75c55c98bc +revision: 0fa5783653f81957fb929e456b70215c8cdf0e1d2ca6e83c48b987518f33bd78 projectscmsync: https://src.opensuse.org/lua/_ObsPrj.git ++++++ build.specials.obscpio ++++++ --- old/.gitignore 2025-07-12 21:03:03.000000000 +0200 +++ new/.gitignore 2025-08-01 10:18:06.000000000 +0200 @@ -2,3 +2,4 @@ _scmsync.obsinfo _buildconfig-* _buildinfo-*.xml +lua54-*-build/ ++++++ execresult.patch ++++++ --- /var/tmp/diff_new_pack.9AQvLq/_old 2025-08-03 13:35:58.047860276 +0200 +++ /var/tmp/diff_new_pack.9AQvLq/_new 2025-08-03 13:35:58.051860442 +0200 @@ -1,10 +1,14 @@ Inspect errno only after failure -Index: lua-5.4.6/src/lauxlib.c +--- + src/lauxlib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: lua-5.4.8/src/lauxlib.c =================================================================== ---- lua-5.4.6.orig/src/lauxlib.c -+++ lua-5.4.6/src/lauxlib.c -@@ -283,7 +283,7 @@ LUALIB_API int luaL_fileresult (lua_Stat +--- lua-5.4.8.orig/src/lauxlib.c 2025-07-15 22:59:14.411309750 +0200 ++++ lua-5.4.8/src/lauxlib.c 2025-07-15 22:59:24.858384379 +0200 +@@ -286,7 +286,7 @@ LUALIB_API int luaL_execresult (lua_State *L, int stat) { ++++++ main_test.patch ++++++ --- /var/tmp/diff_new_pack.9AQvLq/_old 2025-08-03 13:35:58.083861765 +0200 +++ /var/tmp/diff_new_pack.9AQvLq/_new 2025-08-03 13:35:58.087861931 +0200 @@ -2,9 +2,11 @@ testes/main.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---- a/testes/main.lua -+++ b/testes/main.lua -@@ -47,7 +47,7 @@ local function checkprogout (s) +Index: lua-5.4.8/testes/main.lua +=================================================================== +--- lua-5.4.8.orig/testes/main.lua 2025-07-15 22:59:14.472309613 +0200 ++++ lua-5.4.8/testes/main.lua 2025-07-15 22:59:20.829403778 +0200 +@@ -49,7 +49,7 @@ assert(string.sub(s, -1) == "\n") local t = getoutput() for line in string.gmatch(s, ".-\n") do @@ -13,7 +15,7 @@ end end -@@ -367,11 +367,11 @@ a = 2 +@@ -382,11 +382,11 @@ ]] RUN([[lua -e "%s" -i < %s > %s]], prompt, prog, out) local t = getoutput() ++++++ shared_link.patch ++++++ --- /var/tmp/diff_new_pack.9AQvLq/_old 2025-08-03 13:35:58.099862427 +0200 +++ /var/tmp/diff_new_pack.9AQvLq/_new 2025-08-03 13:35:58.103862593 +0200 @@ -4,8 +4,10 @@ src/lundump.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---- a/src/ldebug.h -+++ b/src/ldebug.h +Index: lua-5.4.8/src/ldebug.h +=================================================================== +--- lua-5.4.8.orig/src/ldebug.h 2025-07-15 22:59:14.442309680 +0200 ++++ lua-5.4.8/src/ldebug.h 2025-07-15 22:59:22.983017316 +0200 @@ -36,7 +36,7 @@ #endif @@ -15,9 +17,11 @@ LUAI_FUNC const char *luaG_findlocal (lua_State *L, CallInfo *ci, int n, StkId *pos); LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o, ---- a/src/lmem.h -+++ b/src/lmem.h -@@ -81,7 +81,7 @@ LUAI_FUNC void *luaM_realloc_ (lua_State +Index: lua-5.4.8/src/lmem.h +=================================================================== +--- lua-5.4.8.orig/src/lmem.h 2025-07-15 22:59:14.442309680 +0200 ++++ lua-5.4.8/src/lmem.h 2025-07-15 22:59:22.983203934 +0200 +@@ -81,7 +81,7 @@ size_t size); LUAI_FUNC void *luaM_saferealloc_ (lua_State *L, void *block, size_t oldsize, size_t size); @@ -26,9 +30,11 @@ LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int nelems, int *size, int size_elem, int limit, const char *what); ---- a/src/lundump.h -+++ b/src/lundump.h -@@ -30,7 +30,7 @@ +Index: lua-5.4.8/src/lundump.h +=================================================================== +--- lua-5.4.8.orig/src/lundump.h 2025-07-15 22:59:14.442309680 +0200 ++++ lua-5.4.8/src/lundump.h 2025-07-15 22:59:22.983321338 +0200 +@@ -29,7 +29,7 @@ LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name); /* dump one chunk; from ldump.c */
