Add upstream patch to find python 3.5 (bug #1269095)
This commit is contained in:
parent
f800a4a1a1
commit
67b46d8a5a
36
2db092b1f60b3677a2d44d5563bec216ae687e2f.patch
Normal file
36
2db092b1f60b3677a2d44d5563bec216ae687e2f.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From 2db092b1f60b3677a2d44d5563bec216ae687e2f Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Gobbi <david.gobbi@gmail.com>
|
||||||
|
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)
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
Name: cmake
|
Name: cmake
|
||||||
Version: 3.3.2
|
Version: 3.3.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Cross-platform make system
|
Summary: Cross-platform make system
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
@ -31,6 +31,9 @@ Source3: cmake.attr
|
|||||||
Source4: cmake.prov
|
Source4: cmake.prov
|
||||||
# Patch to find DCMTK in Fedora (bug #720140)
|
# Patch to find DCMTK in Fedora (bug #720140)
|
||||||
Patch0: cmake-dcmtk.patch
|
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
|
||||||
# Patch to fix RindRuby vendor settings
|
# Patch to fix RindRuby vendor settings
|
||||||
# http://public.kitware.com/Bug/view.php?id=12965
|
# http://public.kitware.com/Bug/view.php?id=12965
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=822796
|
# https://bugzilla.redhat.com/show_bug.cgi?id=822796
|
||||||
@ -110,6 +113,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
|
|||||||
%setup -q -n %{name}-%{version}%{?rcver}
|
%setup -q -n %{name}-%{version}%{?rcver}
|
||||||
# We cannot use backups with patches to Modules as they end up being installed
|
# We cannot use backups with patches to Modules as they end up being installed
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch624 -p1
|
%patch624 -p1
|
||||||
@ -286,6 +290,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 6 2015 Orion Poplawski <orion@cora.nwra.com> - 3.3.2-2
|
||||||
|
- Add upstream patch to find python 3.5 (bug #1269095)
|
||||||
|
|
||||||
* Thu Sep 17 2015 Orion Poplawski <orion@cora.nwra.com> - 3.3.2-1
|
* Thu Sep 17 2015 Orion Poplawski <orion@cora.nwra.com> - 3.3.2-1
|
||||||
- Update to 3.3.2
|
- Update to 3.3.2
|
||||||
- Use %%{__global_ldflags}
|
- Use %%{__global_ldflags}
|
||||||
|
Loading…
Reference in New Issue
Block a user