Accepting request 47353 from home:coolo:branches:openSUSE:Factory

reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/47353
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=65

cmake-support-new-python.diff

@@ -0,0 +1,26 @@
+Index: cmake-2.8.2/Modules/FindPythonInterp.cmake
+===================================================================
+--- cmake-2.8.2.orig/Modules/FindPythonInterp.cmake	2010-06-28 17:15:57.000000000 +0200
++++ cmake-2.8.2/Modules/FindPythonInterp.cmake	2010-09-07 10:56:37.825385191 +0200
+@@ -20,7 +20,7 @@
+ #  License text for the above reference.)
+ 
+ FIND_PROGRAM(PYTHON_EXECUTABLE
+-  NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
++  NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+   PATHS
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
+Index: cmake-2.8.2/Modules/FindPythonLibs.cmake
+===================================================================
+--- cmake-2.8.2.orig/Modules/FindPythonLibs.cmake	2010-06-28 17:15:57.000000000 +0200
++++ cmake-2.8.2/Modules/FindPythonLibs.cmake	2010-09-07 11:48:34.313260226 +0200
+@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks)
+ # Search for the python framework on Apple.
+ CMAKE_FIND_FRAMEWORKS(Python)
+ 
+-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
++FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+   STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+   IF(WIN32)
+     FIND_LIBRARY(PYTHON_DEBUG_LIBRARY

cmake.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  7 08:57:01 UTC 2010 - coolo@novell.com
+
+- support new python 2.7
+
 -------------------------------------------------------------------
 Tue Jul 20 20:33:49 UTC 2010 - puzel@novell.com
 

cmake.spec

@@ -27,6 +27,7 @@ Url:            http://www.cmake.org/
 Source0:        %{name}-%{version}.tar.bz2
 Patch4:         cmake-disable-builtin-chrpath.diff
 Patch5:         fortify-buffer-overflows.diff
+Patch6:         cmake-support-new-python.diff
 Summary:        Cross-platform, open-source make system
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1110
@@ -51,6 +52,7 @@ Authors:
 %setup -q -n %{name}-%{version}
 %patch4
 %patch5
+%patch6 -p1
 
 %build
 export CXXFLAGS="$RPM_OPT_FLAGS"