diff --git a/.gitignore b/.gitignore index 6acbd46..ed0c6dc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ lua-5.1.4/ /lua-5.3.3-tests.tar.gz /lua-5.3.4.tar.gz /lua-5.3.4-tests.tar.gz +/lua-5.3.5.tar.gz diff --git a/lua.spec b/lua.spec index 12d832e..27f3c1d 100644 --- a/lua.spec +++ b/lua.spec @@ -1,4 +1,7 @@ %global major_version 5.3 +# Normally, this is the same as version, but... not always. +# No tests yet for 5.3.5 +%global test_version 5.3.4 # If you are incrementing major_version, enable bootstrapping and adjust accordingly. # Version should be the latest prior build. If you don't do this, RPM will break and # everything will grind to a halt. @@ -11,8 +14,8 @@ Name: lua -Version: %{major_version}.4 -Release: 10%{?dist} +Version: %{major_version}.5 +Release: 1%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages License: MIT @@ -23,7 +26,7 @@ Source1: mit.txt %if 0%{?bootstrap} Source2: http://www.lua.org/ftp/lua-%{bootstrap_version}.tar.gz %endif -Source3: http://www.lua.org/tests/lua-%{version}-tests.tar.gz +Source3: http://www.lua.org/tests/lua-%{test_version}-tests.tar.gz # multilib Source4: luaconf.h # rpm-macro @@ -39,11 +42,6 @@ Patch6: %{name}-5.2.2-idsize.patch Patch7: %{name}-5.2.2-luac-shared-link-fix.patch Patch8: %{name}-5.2.2-configure-compat-module.patch %endif -# https://www.lua.org/bugs.html -Patch9: lua-5.3.4-bug1.patch -Patch10: lua-5.3.4-bug4.patch -Patch11: lua-5.3.4-bug5.patch -Patch12: lua-5.3.4-bug6.patch BuildRequires: automake autoconf libtool readline-devel ncurses-devel Requires: lua-libs = %{version}-%{release} @@ -96,10 +94,6 @@ mv src/luaconf.h src/luaconf.h.template.in #%% patch2 -p1 -z .luac-shared %patch3 -p1 -z .configure-linux %patch4 -p1 -z .configure-compat-all -%patch9 -p1 -b .bug1 -%patch10 -p1 -b .bug4 -%patch11 -p1 -b .bug5 -%patch12 -p1 -b .bug6 # Put proper version in configure.ac, patch0 hardcodes 5.3.0 sed -i 's|5.3.0|%{version}|g' configure.ac autoreconf -ifv @@ -144,7 +138,7 @@ popd %endif %check -cd ./lua-%{version}-tests/ +cd ./lua-%{test_version}-tests/ # Dont skip the fully portable or ram-hungry tests: # sed -i.orig -e ' @@ -222,6 +216,9 @@ install -Dpm 0644 %{SOURCE1000} $RPM_BUILD_ROOT/%{macrosdir}/macros.lua %changelog +* Tue Jul 10 2018 Tom Callaway - 5.3.5-1 +- update to 5.3.5 + * Tue Feb 13 2018 Tom Callaway - 5.3.4-10 - move lua(abi) provide to -libs - add fix for bug 6 diff --git a/sources b/sources index 2d232e7..b87a79a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (lua-5.2.3.tar.gz) = 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449 -SHA512 (lua-5.3.4.tar.gz) = 739e31f82e6a60fa99910c2005e991b3a1e21339af52847f653cb190b30842054d189ca116ffcfdf9b36e07888c9ce5642b1dd2988cc7eff9f8789f9a2e34997 SHA512 (lua-5.3.4-tests.tar.gz) = 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb +SHA512 (lua-5.3.5.tar.gz) = 4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4