[ember] lua 5.2

[Tom Callaway]

commit 07459bee4acaba36f7473c27c96e0bf0edf77033
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue May 14 16:15:57 2013 -0400

    lua 5.2

 ember-0.7.0-lua-5.2.patch |   38 ++++++++++++++++++++++++++++++++++++++
 ember.spec                |    7 ++++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/ember-0.7.0-lua-5.2.patch b/ember-0.7.0-lua-5.2.patch
new file mode 100644
index 0000000..c799652
--- /dev/null
+++ b/ember-0.7.0-lua-5.2.patch
@@ -0,0 +1,38 @@
+diff -up ember-0.7.0/src/components/lua/LuaHelper.cpp.lua-52 ember-0.7.0/src/components/lua/LuaHelper.cpp
+--- ember-0.7.0/src/components/lua/LuaHelper.cpp.lua-52	2013-05-14 16:07:36.334360381 -0400
++++ ember-0.7.0/src/components/lua/LuaHelper.cpp	2013-05-14 16:08:56.371361582 -0400
+@@ -35,7 +35,7 @@ namespace Lua {
+ int LuaHelper::luaErrorHandler(lua_State *L) {
+ #if LUA_VERSION_NUM >= 501
+ 	//see if we have the debug library loaded
+-	lua_getfield(L, LUA_GLOBALSINDEX, "debug");
++	lua_getglobal(L, "debug");
+ 	if (!lua_istable(L, -1)) {
+ 		lua_pop(L, 1);
+ 		return 1;
+diff -up ember-0.7.0/src/components/lua/LuaScriptingProvider.cpp.lua-52 ember-0.7.0/src/components/lua/LuaScriptingProvider.cpp
+--- ember-0.7.0/src/components/lua/LuaScriptingProvider.cpp.lua-52	2013-01-14 16:35:44.000000000 -0500
++++ ember-0.7.0/src/components/lua/LuaScriptingProvider.cpp	2013-05-14 16:07:24.159360199 -0400
+@@ -44,7 +44,9 @@ extern "C" {
+ #include "LuaHelper.h"
+ #include "LuaScriptingCallContext.h"
+ 
+-
++#ifndef lua_open
++#define lua_open()     luaL_newstate()
++#endif
+ 
+ namespace Ember {
+ 
+@@ -255,7 +257,10 @@ void LuaScriptingProvider::callFunctionI
+ 		lua_pushcfunction(mLuaState, LuaHelper::luaErrorHandler);   // st: args func err_h
+ 		#else
+ 		lua_pushliteral(mLuaState, "_TRACEBACK");
+-		lua_rawget(mLuaState, LUA_GLOBALSINDEX);  /* get traceback function */
++		lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS);
++		lua_insert(L,-2);
++		lua_rawget(L,-2);
++		lua_remove(L,-2);
+ 		#endif
+ 		lua_insert(mLuaState, error_index);										// st: args err_h func
+ 
diff --git a/ember.spec b/ember.spec
index 61115f3..eb49b61 100644
--- a/ember.spec
+++ b/ember.spec
@@ -1,6 +1,6 @@
 Name:           ember
 Version:        0.7.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        3D client for WorldForge
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@ Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.t
 Patch1:         ember-0.6.3-fix_implicit_dso.patch
 Patch3:         ember-start.patch
 Patch4:         ember-0.7.0-boost_shared_array.patch
+Patch5:		ember-0.7.0-lua-5.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel tinyxml-devel DevIL-devel cegui-devel ogre-devel
@@ -34,6 +35,7 @@ It uses the Ogre 3D engine with CEGUI.
 %patch1 -p1 -b .fix_implicit_dso
 %patch3 -p0 -b .start
 %patch4 -p1 -b .boost_shared_array
+%patch5 -p1 -b .lua-52
 
 # Encoding fix
 iconv -f iso-8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
@@ -91,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/%{name}/*
 
 %changelog
+* Tue May 14 2013 Tom Callaway <spot at fedoraproject.org> - 0.7.0-6
+- lua 5.2
+
 * Sun Feb 24 2013 Bruno Wolff III <bruno at wolff.to> - 0.7.0-5
 - Remove vendor prefix from desktop file