- fix building with versioned boost-python

- rel 5

diff --git a/CEGUI.spec b/CEGUI.spec
index 8364bc92224bfaa344b1d0c35de48b07afdff94d..b91b1c77035834991e5757881fb88d76dd26683b 100644 (file)
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -10,7 +10,7 @@ Summary:      CEGUI - a free library providing windowing and widgets
 Summary(pl.UTF-8):     CEGUI - wolnodostępna biblioteka zapewniającą okienka i widgety
 Name:          CEGUI
 Version:       0.8.7
-Release:       4
+Release:       5
 License:       LGPL v2.1+ (with MIT parts)
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.bz2
@@ -21,6 +21,7 @@ Patch0:               pthread.patch
 Patch1:                %{name}-glfw3.patch
 Patch3:                x32.patch
 Patch4:                cxx11.patch
+Patch5:                python2.patch
 URL:           http://www.cegui.org.uk/
 BuildRequires: DevIL-devel
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 1.2.0}
@@ -462,6 +463,7 @@ Wiązania Pythona do biblioteki CEGUI OpenGLRenderer.
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 install -d build

diff --git a/python2.patch b/python2.patch
new file mode 100644 (file)
index 0000000..e279097
--- /dev/null
+++ b/python2.patch
@@ -0,0 +1,20 @@
+--- cegui-0.8.7/CMakeLists.txt~        2019-04-18 08:25:25.000000000 +0200
++++ cegui-0.8.7/CMakeLists.txt 2019-04-19 09:41:27.720505266 +0200
+@@ -126,7 +126,7 @@
+ else()
+   find_package(PythonLibs)
+ endif()
+-find_package(Boost 1.36.0 COMPONENTS python unit_test_framework system timer)
++find_package(Boost 1.36.0 COMPONENTS python27 unit_test_framework system timer)
+ 
+ find_package(Doxygen)
+ find_package(GTK2 COMPONENTS gtk)
+@@ -213,7 +213,7 @@
+ cegui_dependent_option( CEGUI_BUILD_LUA_MODULE "Specifies whether to build the Lua based script module" "LUA51_FOUND;TOLUAPP_FOUND" )
+ cegui_dependent_option( CEGUI_BUILD_LUA_GENERATOR "Specifies whether to build the custom tolua binding generator 'toluappcegui'" "LUA51_FOUND;TOLUAPP_FOUND" )
+ 
+-cegui_dependent_option( CEGUI_BUILD_PYTHON_MODULES "Specifies whether to build the Python extension module(s)" "PYTHONINTERP_FOUND;PYTHONLIBS_FOUND;Boost_PYTHON_FOUND" )
++cegui_dependent_option( CEGUI_BUILD_PYTHON_MODULES "Specifies whether to build the Python extension module(s)" "PYTHONINTERP_FOUND;PYTHONLIBS_FOUND;Boost_PYTHON27_FOUND" )
+ 
+ option( CEGUI_OPTION_SAFE_LUA_MODULE "Specifies whether to enable extra validation in the Lua script module in non-debug builds" FALSE )
+