summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Callaway <spot@fedoraproject.org>2013-10-23 17:12:32 +0100
committerTom Callaway <spot@fedoraproject.org>2013-10-23 17:12:32 +0100
commitaa9c315347b5e6aec0807bc7242e753938f599dd (patch)
treed8b772214d7a919badf5c6938a8f46ca8db3d222
parent4722481a4d70b577df0dd6d114d48c3b923eb8b8 (diff)
downloadlua-aa9c315347b5e6aec0807bc7242e753938f599dd.tar.gz
lua-aa9c315347b5e6aec0807bc7242e753938f599dd.tar.xz
lua-aa9c315347b5e6aec0807bc7242e753938f599dd.zip
readd and fix configure-compat-module.patch to use LUA_CONFIG_ALL instead
-rw-r--r--lua-5.2.2-configure-compat-module.patch4
-rw-r--r--lua.spec7
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 <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
- drop configure-compat-module.patch, if you really need old lua behavior, use compat-lua