[cegui] Rebuilt against new lua-5.2 based tolua++
Hans de Goede
jwrdegoede at fedoraproject.org
Wed Dec 17 12:34:48 UTC 2014
commit a36df67306260bd359196420676ad350199a517b
Author: Hans de Goede <hdegoede at redhat.com>
Date: Wed Dec 17 13:34:38 2014 +0100
Rebuilt against new lua-5.2 based tolua++
cegui-0.8.4-lua52.patch | 23 +++++++++++++++++++++++
cegui.spec | 11 ++++++++---
2 files changed, 31 insertions(+), 3 deletions(-)
---
diff --git a/cegui-0.8.4-lua52.patch b/cegui-0.8.4-lua52.patch
new file mode 100644
index 0000000..c9d749f
--- /dev/null
+++ b/cegui-0.8.4-lua52.patch
@@ -0,0 +1,23 @@
+diff -up cegui-0.8.4/cmake/FindLua51.cmake~ cegui-0.8.4/cmake/FindLua51.cmake
+--- cegui-0.8.4/cmake/FindLua51.cmake~ 2014-06-12 08:38:33.000000000 +0200
++++ cegui-0.8.4/cmake/FindLua51.cmake 2014-12-17 12:07:18.090383447 +0100
+@@ -3,14 +3,14 @@
+ ################################################################################
+ include(FindPackageHandleStandardArgs)
+
+-find_path(LUA_H_PATH NAMES lua.h PATH_SUFFIXES lua5.1 lua51 lua-5.1 lua)
+-find_library(LUA_LIB NAMES lua5.1 lua51 lua-5.1 lua PATH_SUFFIXES dynamic)
+-find_library(LUA_LIB_DBG NAMES lua5.1_d lua51_d lua-5.1_d lua_d PATH_SUFFIXES dynamic)
++find_path(LUA_H_PATH NAMES lua.h PATH_SUFFIXES lua5.2 lua52 lua-5.2 lua)
++find_library(LUA_LIB NAMES lua5.2 lua52 lua-5.2 lua PATH_SUFFIXES dynamic)
++find_library(LUA_LIB_DBG NAMES lua5.2_d lua52_d lua-5.2_d lua_d PATH_SUFFIXES dynamic)
+ mark_as_advanced(LUA_H_PATH LUA_LIB LUA_LIB_DBG)
+
+ if (WIN32 OR APPLE)
+- find_library(LUA_LIB_STATIC NAMES lua5.1 lua51 lua-5.1 lua PATH_SUFFIXES static)
+- find_library(LUA_LIB_STATIC_DBG NAMES lua5.1_d lua51_d lua-5.1_d lua_d PATH_SUFFIXES static)
++ find_library(LUA_LIB_STATIC NAMES lua5.2 lua52 lua-5.2 lua PATH_SUFFIXES static)
++ find_library(LUA_LIB_STATIC_DBG NAMES lua5.2_d lua52_d lua-5.2_d lua_d PATH_SUFFIXES static)
+ mark_as_advanced(LUA_LIB_STATIC LUA_LIB_STATIC_DBG)
+ endif()
+
diff --git a/cegui.spec b/cegui.spec
index 37b2762..9937572 100644
--- a/cegui.spec
+++ b/cegui.spec
@@ -3,7 +3,7 @@
Name: cegui
Version: 0.8.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Free library providing windowing and widgets for graphics APIs / engines
Group: System Environment/Libraries
License: MIT
@@ -11,6 +11,7 @@ URL: http://www.cegui.org.uk
Source0: http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.bz2
# This can be removed when we rebase to 0.8.5
Patch0: cegui-0.8.4-samples-no-glfw.patch
+Patch1: cegui-0.8.4-lua52.patch
BuildRequires: DevIL-devel
BuildRequires: freeimage-devel
@@ -22,12 +23,12 @@ BuildRequires: glm-devel
BuildRequires: libGLU-devel
BuildRequires: libtool
BuildRequires: libSM-devel
-BuildRequires: compat-lua-devel >= 0.5.1
+BuildRequires: lua-devel >= 0.5.2
BuildRequires: pcre-devel
BuildRequires: pkgconfig >= 0.9.0
BuildRequires: SILLY-devel
BuildRequires: xerces-c-devel
-BuildRequires: tolua++-devel
+BuildRequires: tolua++-devel >= 1.0.93-14
BuildRequires: tinyxml-devel
BuildRequires: glew-devel
BuildRequires: ogre-devel >= 1.7.0
@@ -170,6 +171,7 @@ OpenGLRenderer (module PyCEGUIOpenGLRenderer).
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%cmake \
@@ -273,6 +275,9 @@ find $RPM_BUILD_ROOT -name "CEGUITests-0.8" -exec rm -f {} ';'
%changelog
+* Wed Dec 17 2014 Hans de Goede <hdegoede at redhat.com> - 0.8.4-6
+- Rebuilt against new lua-5.2 based tolua++
+
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list