From 8761af507aa3b0bb5a089611c826d6e54e268e284571055581eccd8852870263 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 8 Sep 2010 13:49:00 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/cmake revision 41.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=539e99f99c6cc8f5094c8f9eccbbee11 --- cmake-gui.spec | 2 +- cmake-support-new-python.diff | 26 ++++++++++++++++++++++++++ cmake.changes | 5 +++++ cmake.spec | 4 +++- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 cmake-support-new-python.diff diff --git a/cmake-gui.spec b/cmake-gui.spec index c877053..4fee62e 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -20,7 +20,7 @@ Name: cmake-gui Version: 2.8.2 -Release: 1 +Release: 2 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ diff --git a/cmake-support-new-python.diff b/cmake-support-new-python.diff new file mode 100644 index 0000000..b0efbd1 --- /dev/null +++ b/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 diff --git a/cmake.changes b/cmake.changes index 4ebd82d..03ae39d 100644 --- a/cmake.changes +++ b/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 diff --git a/cmake.spec b/cmake.spec index 2fd610c..f2dc511 100644 --- a/cmake.spec +++ b/cmake.spec @@ -20,13 +20,14 @@ Name: cmake Version: 2.8.2 -Release: 1 +Release: 2 License: BSD3c Group: Development/Tools/Building 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"