readd and fix configure-compat-module.patch to use LUA_CONFIG_ALL instead

This commit is contained in:
Tom Callaway 2013-10-23 17:12:32 +01:00
parent 4722481a4d
commit aa9c315347
2 changed files with 8 additions and 3 deletions

View File

@ -11,9 +11,9 @@ diff -up lua-5.2.2/configure.ac.compat-module lua-5.2.2/configure.ac
+ [use_compat_module=no] + [use_compat_module=no]
+) +)
+ +
+COMPAT_DEFS="#undef LUA_COMPAT_MODULE" +COMPAT_DEFS="#undef LUA_COMPAT_ALL"
+if test "x$use_compat_module" == "xyes"; then +if test "x$use_compat_module" == "xyes"; then
+ COMPAT_DEFS="#define LUA_COMPAT_MODULE" + COMPAT_DEFS="#define LUA_COMPAT_ALL"
+fi +fi
+AC_SUBST(COMPAT_DEFS) +AC_SUBST(COMPAT_DEFS)
+ +

View File

@ -2,7 +2,7 @@
Name: lua Name: lua
Version: %{major_version}.2 Version: %{major_version}.2
Release: 3%{?dist} Release: 5%{?dist}
Summary: Powerful light-weight programming language Summary: Powerful light-weight programming language
Group: Development/Languages Group: Development/Languages
License: MIT License: MIT
@ -12,6 +12,7 @@ Patch0: %{name}-%{version}-autotoolize.patch
Patch1: %{name}-%{version}-idsize.patch Patch1: %{name}-%{version}-idsize.patch
Patch2: %{name}-%{version}-luac-shared-link-fix.patch Patch2: %{name}-%{version}-luac-shared-link-fix.patch
Patch3: %{name}-%{version}-configure-linux.patch Patch3: %{name}-%{version}-configure-linux.patch
Patch4: %{name}-%{version}-configure-compat-module.patch
BuildRequires: automake autoconf libtool readline-devel ncurses-devel BuildRequires: automake autoconf libtool readline-devel ncurses-devel
Provides: lua(abi) = %{major_version} Provides: lua(abi) = %{major_version}
@ -50,6 +51,7 @@ mv src/luaconf.h src/luaconf.h.template.in
%patch1 -p1 -z .idsize %patch1 -p1 -z .idsize
%patch2 -p1 -z .luac-shared %patch2 -p1 -z .luac-shared
%patch3 -p1 -z .configure-linux %patch3 -p1 -z .configure-linux
%patch4 -p1 -z .configure-compat-all
autoreconf -i autoreconf -i
@ -94,6 +96,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version}
%changelog %changelog
* Wed Oct 23 2013 Tom Callaway <spot@fedoraproject.org> - 5.2.2-5
- readd and fix configure-compat-module.patch to use LUA_CONFIG_ALL instead
* Wed Oct 23 2013 Tom Callaway <spot@fedoraproject.org> - 5.2.2-4 * Wed Oct 23 2013 Tom Callaway <spot@fedoraproject.org> - 5.2.2-4
- drop configure-compat-module.patch, if you really need old lua behavior, use compat-lua - drop configure-compat-module.patch, if you really need old lua behavior, use compat-lua