[packages/CEGUI] - more BRs - added python patch (use python library version consistent with found python interpreter

qboosh qboosh at pld-linux.org
Sun Oct 26 10:55:05 CET 2014


commit 4d330e92748d5675e60af2dfcbc2acc771620e51
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 26 10:54:54 2014 +0100

    - more BRs
    - added python patch (use python library version consistent with found python interpreter)

 CEGUI-python.patch | 11 +++++++++++
 CEGUI.spec         |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/CEGUI.spec b/CEGUI.spec
index 6d15f76..5bf6058 100644
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -19,10 +19,13 @@ Source1:	http://downloads.sourceforge.net/crayzedsgui/cegui-docs-%{version}.tar.
 # Source1-md5:	1096bf8c84bf6a22e8892ab9258c22f6
 Patch0:		pthread.patch
 Patch1:		%{name}-glfw3.patch
+Patch2:		%{name}-python.patch
 URL:		http://www.cegui.org.uk/
 BuildRequires:	DevIL-devel
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 1.2.0}
 BuildRequires:	FreeImage-devel
+BuildRequires:	GLM
+BuildRequires:	OpenGL-devel
 BuildRequires:	SILLY-devel >= 0.1.0
 BuildRequires:	boost-devel >= 1.36.0
 BuildRequires:	boost-python-devel >= 1.36.0
@@ -32,6 +35,8 @@ BuildRequires:	doxygen
 BuildRequires:	expat-devel
 BuildRequires:	fribidi-devel
 BuildRequires:	freetype-devel >= 2.0
+BuildRequires:	glew-devel
+# for SampleFramework
 BuildRequires:	glfw-devel
 BuildRequires:	gtk+2-devel >= 2:2.4
 BuildRequires:	irrlicht-devel >= 1.4
@@ -46,7 +51,7 @@ BuildRequires:	ois-devel >= 1.0.0
 %endif
 BuildRequires:	pcre-devel >= 5.0
 BuildRequires:	pkgconfig
-BuildRequires:	python-devel
+BuildRequires:	python-devel >= 2
 BuildRequires:	rapidxml
 BuildRequires:	sed >= 4.0
 BuildRequires:	tinyxml-devel
@@ -425,6 +430,7 @@ Wiązania Pythona do biblioteki CEGUI OpenGLRenderer.
 %setup -q -a 1 -n cegui-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
diff --git a/CEGUI-python.patch b/CEGUI-python.patch
new file mode 100644
index 0000000..d15a8a5
--- /dev/null
+++ b/CEGUI-python.patch
@@ -0,0 +1,11 @@
+--- cegui-0.8.4/CMakeLists.txt.orig	2014-07-07 10:46:25.000000000 +0200
++++ cegui-0.8.4/CMakeLists.txt	2014-10-26 07:04:55.574145118 +0100
+@@ -106,7 +106,7 @@
+ find_package(Lua51)
+ find_package(TOLUAPP)
+ find_package(PythonInterp)
+-find_package(PythonLibs)
++find_package(PythonLibs ${PYTHON_VERSION_STRING})
+ find_package(Boost 1.36.0 COMPONENTS python unit_test_framework system)
+ 
+ find_package(Doxygen)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/CEGUI.git/commitdiff/4d330e92748d5675e60af2dfcbc2acc771620e51



More information about the pld-cvs-commit mailing list