From 4798c1522a921a6756ae70b5e64c91d8697b6a88 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 6 Oct 2015 08:30:43 -0600 Subject: [PATCH] Rebase python3.5 patch --- ...92b1f60b3677a2d44d5563bec216ae687e2f.patch | 36 ------------------- cmake-python3.5.patch | 12 +++++++ cmake.spec | 2 +- 3 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 2db092b1f60b3677a2d44d5563bec216ae687e2f.patch create mode 100644 cmake-python3.5.patch diff --git a/2db092b1f60b3677a2d44d5563bec216ae687e2f.patch b/2db092b1f60b3677a2d44d5563bec216ae687e2f.patch deleted file mode 100644 index bf1d263..0000000 --- a/2db092b1f60b3677a2d44d5563bec216ae687e2f.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2db092b1f60b3677a2d44d5563bec216ae687e2f Mon Sep 17 00:00:00 2001 -From: David Gobbi -Date: Mon, 14 Sep 2015 21:44:36 -0600 -Subject: [PATCH] FindPython{Interp,Libs}: Add versions 3.5 and 3.6 - ---- - Modules/FindPythonInterp.cmake | 2 +- - Modules/FindPythonLibs.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake -index 8784e18..879192e 100644 ---- a/Modules/FindPythonInterp.cmake -+++ b/Modules/FindPythonInterp.cmake -@@ -51,7 +51,7 @@ unset(_Python_NAMES) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(PythonInterp_FIND_VERSION) - if(PythonInterp_FIND_VERSION_COUNT GREATER 1) -diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake -index b80d3ce..d01fae4 100644 ---- a/Modules/FindPythonLibs.cmake -+++ b/Modules/FindPythonLibs.cmake -@@ -64,7 +64,7 @@ set(CMAKE_FIND_FRAMEWORK LAST) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(PythonLibs_FIND_VERSION) - if(PythonLibs_FIND_VERSION_COUNT GREATER 1) diff --git a/cmake-python3.5.patch b/cmake-python3.5.patch new file mode 100644 index 0000000..62fe725 --- /dev/null +++ b/cmake-python3.5.patch @@ -0,0 +1,12 @@ +diff -up cmake-3.3.2/Modules/FindPythonLibs.cmake.orig cmake-3.3.2/Modules/FindPythonLibs.cmake +--- cmake-3.3.2/Modules/FindPythonLibs.cmake.orig 2015-09-16 10:53:05.000000000 -0600 ++++ cmake-3.3.2/Modules/FindPythonLibs.cmake 2015-10-06 08:14:58.323564067 -0600 +@@ -55,7 +55,7 @@ CMAKE_FIND_FRAMEWORKS(Python) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + + if(PythonLibs_FIND_VERSION) + if(PythonLibs_FIND_VERSION_COUNT GREATER 1) diff --git a/cmake.spec b/cmake.spec index 7f51933..8d8d55c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -33,7 +33,7 @@ Source4: cmake.prov Patch0: cmake-dcmtk.patch # Upstream patch to find python 3.5/3.6 # https://bugzilla.redhat.com/show_bug.cgi?id=1269095 -Patch1: https://github.com/Kitware/CMake/commit/2db092b1f60b3677a2d44d5563bec216ae687e2f.patch +Patch1: cmake-python3.5.patch # Patch to fix RindRuby vendor settings # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796