]> git.pld-linux.org Git - packages/cmake.git/commitdiff
- rel 3; look for python 3.5 and 3.4, too cmake-2 auto/th/cmake-2.8.12.2-3
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Tue, 21 Oct 2014 10:00:17 +0000 (12:00 +0200)
committerArkadiusz Miśkiewicz <arekm@maven.pl>
Tue, 21 Oct 2014 10:00:17 +0000 (12:00 +0200)
cmake-findpython.patch [new file with mode: 0644]
cmake.spec

diff --git a/cmake-findpython.patch b/cmake-findpython.patch
new file mode 100644 (file)
index 0000000..92be82a
--- /dev/null
@@ -0,0 +1,11 @@
+--- cmake-2.8.12.2/Modules/FindPythonLibs.cmake~       2014-01-16 18:15:08.000000000 +0100
++++ cmake-2.8.12.2/Modules/FindPythonLibs.cmake        2014-10-21 11:59:07.048973118 +0200
+@@ -38,7 +38,7 @@
+ 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.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.5 3.4 3.3 3.2 3.1 3.0)
+ if(PythonLibs_FIND_VERSION)
+     if(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
index 818edd296d924b1ebd08d03c9094a52db79cc07d..3631f581a9bd54b43c1628b8c141835866027d69 100644 (file)
@@ -13,7 +13,7 @@ Summary:      Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
 Version:       2.8.12.2
-Release:       2
+Release:       3
 License:       BSD
 Group:         Development/Building
 Source0:       http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
@@ -24,6 +24,7 @@ Patch2:               %{name}-findruby.patch
 Patch3:                %{name}-tests.patch
 Patch4:                %{name}-freetype2.patch
 Patch5:                %{name}-findruby2.patch
+Patch6:                %{name}-findpython.patch
 URL:           http://www.cmake.org/
 %{?with_gui:BuildRequires:     QtGui-devel}
 BuildRequires: libarchive-devel
@@ -104,6 +105,7 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
This page took 0.043952 seconds and 4 git commands to generate.