From aa9c315347b5e6aec0807bc7242e753938f599dd Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 23 Oct 2013 17:12:32 +0100 Subject: readd and fix configure-compat-module.patch to use LUA_CONFIG_ALL instead --- lua-5.2.2-configure-compat-module.patch | 4 ++-- lua.spec | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lua-5.2.2-configure-compat-module.patch b/lua-5.2.2-configure-compat-module.patch index 8393202..80bb047 100644 --- a/lua-5.2.2-configure-compat-module.patch +++ b/lua-5.2.2-configure-compat-module.patch @@ -11,9 +11,9 @@ diff -up lua-5.2.2/configure.ac.compat-module lua-5.2.2/configure.ac + [use_compat_module=no] +) + -+COMPAT_DEFS="#undef LUA_COMPAT_MODULE" ++COMPAT_DEFS="#undef LUA_COMPAT_ALL" +if test "x$use_compat_module" == "xyes"; then -+ COMPAT_DEFS="#define LUA_COMPAT_MODULE" ++ COMPAT_DEFS="#define LUA_COMPAT_ALL" +fi +AC_SUBST(COMPAT_DEFS) + diff --git a/lua.spec b/lua.spec index 8b68501..5f0130b 100644 --- a/lua.spec +++ b/lua.spec @@ -2,7 +2,7 @@ Name: lua Version: %{major_version}.2 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages License: MIT @@ -12,6 +12,7 @@ Patch0: %{name}-%{version}-autotoolize.patch Patch1: %{name}-%{version}-idsize.patch Patch2: %{name}-%{version}-luac-shared-link-fix.patch Patch3: %{name}-%{version}-configure-linux.patch +Patch4: %{name}-%{version}-configure-compat-module.patch BuildRequires: automake autoconf libtool readline-devel ncurses-devel Provides: lua(abi) = %{major_version} @@ -50,6 +51,7 @@ mv src/luaconf.h src/luaconf.h.template.in %patch1 -p1 -z .idsize %patch2 -p1 -z .luac-shared %patch3 -p1 -z .configure-linux +%patch4 -p1 -z .configure-compat-all autoreconf -i @@ -94,6 +96,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version} %changelog +* Wed Oct 23 2013 Tom Callaway - 5.2.2-5 +- readd and fix configure-compat-module.patch to use LUA_CONFIG_ALL instead + * Wed Oct 23 2013 Tom Callaway - 5.2.2-4 - drop configure-compat-module.patch, if you really need old lua behavior, use compat-lua -- cgit