[fillets-ng] lua 5.2

[Tom Callaway]

commit 0ec99dec6c899c834664816f322686e93196224c
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue May 14 16:36:40 2013 -0400

    lua 5.2

 .gitignore                     |    1 +
 fillets-ng-1.0.1-lua-5.2.patch |   37 +++++++++++++++++++++++++++++++++++++
 fillets-ng.spec                |   12 ++++++++----
 sources                        |    2 +-
 4 files changed, 47 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79206cf..4839a30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 fillets-ng-0.9.1.tar.gz
+/fillets-ng-1.0.1.tar.gz
diff --git a/fillets-ng-1.0.1-lua-5.2.patch b/fillets-ng-1.0.1-lua-5.2.patch
new file mode 100644
index 0000000..7175f3d
--- /dev/null
+++ b/fillets-ng-1.0.1-lua-5.2.patch
@@ -0,0 +1,37 @@
+diff -up fillets-ng-1.0.1/src/gengine/ScriptState.cpp.lua-52 fillets-ng-1.0.1/src/gengine/ScriptState.cpp
+--- fillets-ng-1.0.1/src/gengine/ScriptState.cpp.lua-52	2005-07-06 14:50:18.000000000 -0400
++++ fillets-ng-1.0.1/src/gengine/ScriptState.cpp	2013-05-14 16:34:30.954384609 -0400
+@@ -17,6 +17,10 @@ extern "C" {
+ #include "lauxlib.h"
+ }
+ 
++#ifndef lua_open
++#define lua_open()     luaL_newstate()
++#endif
++
+ #include "def-script.h"
+ 
+ //-----------------------------------------------------------------
+@@ -42,9 +46,8 @@ ScriptState::~ScriptState()
+ void
+ ScriptState::prepareErrorHandler()
+ {
+-    lua_pushliteral(m_state, "_TRACEBACK");
+     lua_pushcfunction(m_state, script_debugStack);
+-    lua_settable(m_state, LUA_GLOBALSINDEX);
++    lua_setglobal(m_state, "_TRACEBACK");
+ }
+ //-----------------------------------------------------------------
+ /**
+@@ -54,7 +57,10 @@ void
+ ScriptState::insertErrorHandler(int index)
+ {
+     lua_pushliteral(m_state, "_TRACEBACK");
+-    lua_rawget(m_state, LUA_GLOBALSINDEX);
++    lua_rawgeti(m_state, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS);
++    lua_insert(m_state, -2);
++    lua_rawget(m_state, -2);
++    lua_remove(m_state, -2);
+     lua_insert(m_state, index);
+ }
+ //-----------------------------------------------------------------
diff --git a/fillets-ng.spec b/fillets-ng.spec
index e32a644..833b836 100644
--- a/fillets-ng.spec
+++ b/fillets-ng.spec
@@ -1,7 +1,7 @@
 Summary: Fish Fillets Next Generation, a puzzle game with 70 levels
 Name: fillets-ng
-Version: 0.9.1
-Release: 5%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://fillets.sourceforge.net/
@@ -9,7 +9,7 @@ Source0: http://downloads.sf.net/fillets/fillets-ng-%{version}.tar.gz
 Source1: fillets.desktop
 Source2: fillets.png
 Patch0: fillets-ng-0.8.1-gcc43.patch
-Patch1: fillets-ng-0.8.0-fribidi.patch
+Patch1: fillets-ng-1.0.1-lua-5.2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: fillets-ng-data >= 0.9.0
 BuildRequires: SDL-devel
@@ -34,7 +34,7 @@ comforting music.
 %prep
 %setup -q
 %patch0 -p1 -b .gcc43
-%patch1 -p1 -b .fribidi
+%patch1 -p1 -b .lua-52
 
 
 %build
@@ -85,6 +85,10 @@ fi
 
 
 %changelog
+* Tue May 14 2013 Tom Callaway <spot at fedoraproject.org> - 1.0.1-1
+- update to 1.0.1
+- lua 5.2 fix
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index f8de2a4..248bff5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13bb4f98d73bc0b6aff39ee1c9582adb  fillets-ng-0.9.1.tar.gz
+bdd2dfacaab345f12d9ab0ff1d0ab6dc  fillets-ng-1.0.1.tar.gz