diff --git a/cmake-python39.patch b/cmake-python39.patch deleted file mode 100644 index ec39c71..0000000 --- a/cmake-python39.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 3bad618ecea6a0552490515f18934ffd05c69983 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Tue, 14 Jan 2020 19:41:29 +0100 -Subject: [PATCH] FindPython: Add support for version 3.9 - -Development versions of Python 3.9.0 are already out there. - -See PEP 596 -- Python 3.9 Release Schedule: -https://www.python.org/dev/peps/pep-0596/ ---- - Modules/FindPython/Support.cmake | 2 +- - Modules/FindPythonInterp.cmake | 2 +- - Modules/FindPythonLibs.cmake | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake -index 7c20512080..7483d72ad8 100644 ---- a/Modules/FindPython/Support.cmake -+++ b/Modules/FindPython/Support.cmake -@@ -23,7 +23,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) - message (FATAL_ERROR "FindPython: INTERNAL ERROR") - endif() - if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3) -- set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+ set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2) - set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) - else() -diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake -index ccc7d5b585..1e01a99cbe 100644 ---- a/Modules/FindPythonInterp.cmake -+++ b/Modules/FindPythonInterp.cmake -@@ -54,7 +54,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.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.9 3.8 3.7 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 1d62ac43ea..d3ec7beec6 100644 ---- a/Modules/FindPythonLibs.cmake -+++ b/Modules/FindPythonLibs.cmake -@@ -79,7 +79,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.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.9 3.8 3.7 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) --- -2.24.1 - diff --git a/cmake.spec b/cmake.spec index 7055ac2..2d38556 100644 --- a/cmake.spec +++ b/cmake.spec @@ -98,9 +98,6 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch -# FindPython: Add support for version 3.9 -# https://gitlab.kitware.com/cmake/cmake/merge_requests/4225 -Patch103: %{name}-python39.patch # Patch for renaming on EPEL