diff --git a/baselibs.conf b/baselibs.conf index 2fa28f4..54c7f60 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -liblua5_4-5 +liblua5_4-6 diff --git a/lua-5.4.5.tar.gz b/lua-5.4.5.tar.gz deleted file mode 100644 index f8d0b57..0000000 --- a/lua-5.4.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59df426a3d50ea535a460a452315c4c0d4e1121ba72ff0bdde58c2ef31d6f444 -size 363316 diff --git a/lua-5.4.6-rc1.tar.gz b/lua-5.4.6-rc1.tar.gz new file mode 100644 index 0000000..ac89c8d --- /dev/null +++ b/lua-5.4.6-rc1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 +size 363329 diff --git a/lua54.spec b/lua54.spec index 65e91d3..b7a1578 100644 --- a/lua54.spec +++ b/lua54.spec @@ -24,17 +24,17 @@ %define name_ext %{nil} %endif %define major_version 5.4 -%define libname liblua5_4-5 +%define libname liblua5_4-6 Name: lua54%{name_ext} -Version: 5.4.5 +Version: 5.4.6~rc1 Release: 0 Summary: Small Embeddable Language with Procedural Syntax License: GPL-3.0-or-later Group: Development/Languages/Other URL: https://www.lua.org -Source: http://www.lua.org/ftp/lua-%{version}.tar.gz -Source1: http://www.lua.org/tests/lua-%{version}-tests.tar.gz +Source: https://www.lua.org/work/lua-5.4.6-rc1.tar.gz +Source1: https://www.lua.org/tests/lua-5.4.5-tests.tar.gz Source99: baselibs.conf # PATCH-FIX-SUSE tweak the buildsystem to produce what is needed for SUSE Patch0: lua-build-system.patch @@ -140,8 +140,8 @@ scripting, and rapid prototyping. Lua is implemented as a small library of C functions, written in ANSI C. %prep -%setup -q -n lua-%{version} -a1 -mv lua-%{version}-tests testes +%setup -q -n lua-5.4.6 -a1 +mv lua-5.4.5-tests testes %autopatch -p1 # manpage @@ -164,6 +164,8 @@ make linux-readline %{_smp_mflags} VERBOSE=1 -C src \ INSTALL_LIB="%{buildroot}%{_libdir}" \ INSTALL_MAN="%{buildroot}%{_mandir}/man1" +find %{buildroot} -name \*.so\* -ls + find %{buildroot} -type f -name "*.la" -delete -print # create pkg-config file @@ -181,6 +183,7 @@ Version: %{version} Libs: -llua%{major_version} -lm Cflags: -I\${includedir} EOF + install -D -m 644 lua%{major_version}.pc %{buildroot}%{_libdir}/pkgconfig/lua%{major_version}.pc # update-alternatives @@ -192,6 +195,8 @@ for file in lua luac ; do ln -sf "%{_sysconfdir}/alternatives/${file}.1%{ext_man}" "%{buildroot}%{_mandir}/man1/${file}.1%{ext_man}" done +# /home/abuild/rpmbuild/BUILDROOT/lua54-5.4.6~rc1-0.x86_64/usr/lib64/liblua5.4.so + # lrwxrwxrwx. 1 abuild abuild 27 May 3 21:50 liblua.so -> /etc/alternatives/liblua.so # lrwxrwxrwx. 1 abuild abuild 18 May 3 21:50 liblua.so.5.4 -> liblua5.4.so.5.4.0 # -rw-r--r--. 1 abuild abuild 30352 May 3 21:50 liblua5.4.a