From bfc0d14d74b235c02cd5b5dbea82ce3561d1e209 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Fri, 23 Jul 2010 18:47:55 +0000 Subject: [PATCH] - add support for Python 2.7 to FindPythonLibs.cmake (Orcan Ogetbil) --- cmake-2.8.2-python27.patch | 12 ++++++++++++ cmake.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 cmake-2.8.2-python27.patch diff --git a/cmake-2.8.2-python27.patch b/cmake-2.8.2-python27.patch new file mode 100644 index 0000000..d5be65a --- /dev/null +++ b/cmake-2.8.2-python27.patch @@ -0,0 +1,12 @@ +diff -ur cmake-2.8.2/Modules/FindPythonLibs.cmake cmake-2.8.2-python27/Modules/FindPythonLibs.cmake +--- cmake-2.8.2/Modules/FindPythonLibs.cmake 2010-06-28 17:15:57.000000000 +0200 ++++ cmake-2.8.2-python27/Modules/FindPythonLibs.cmake 2010-07-23 20:42:29.000000000 +0200 +@@ -27,7 +27,7 @@ + # 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.spec b/cmake.spec index dd10d9a..476e93c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ Name: cmake Version: 2.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -16,6 +16,10 @@ License: BSD URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source2: macros.cmake + +# add support for Python 2.7 to FindPythonLibs.cmake (Orcan Ogetbil) +Patch0: cmake-2.8.2-python27.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran @@ -51,6 +55,8 @@ The %{name}-gui package contains the Qt based GUI for CMake. %prep %setup -q -n %{name}-%{version}%{?rcver} +# Python 2.7 patch (don't use -b as the backup would get installed) +%patch0 -p1 # Fixup permissions find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x @@ -138,6 +144,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Fri Jul 23 2010 Kevin Kofler - 2.8.2-2 +- add support for Python 2.7 to FindPythonLibs.cmake (Orcan Ogetbil) + * Tue Jul 6 2010 Orion Poplawski - 2.8.2-1 - Update to 2.8.2 final