- up to 3.3.2

diff --git a/cmake-min-ver.patch b/cmake-min-ver.patch
deleted file mode 100644 (file)
index f356a09..0000000
--- a/cmake-min-ver.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eike@sf-mail.de>
-Date: Tue, 18 Aug 2015 12:14:43 +0200
-Subject: [PATCH 1/1] FindPkgConfig: remove variable dereference
-
-If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
-cmake_minimum_required() call is present this line can lead to an error as that
-string is empty so too few arguments are passed to if():
-
-See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
-See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
-CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
-  given arguments:
-
-    "VERSION_LESS" "3.1"
-
-  Unknown arguments specified
-Call Stack (most recent call first):
-  /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
-  /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
----
- Modules/FindPkgConfig.cmake |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 526a62e..ae6903e 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
-       set(${_no_cmake_path} 1)
-       set(${_no_cmake_environment_path} 1)
-     endif()
--  elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
-+  elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
-     set(${_no_cmake_path} 1)
-     set(${_no_cmake_environment_path} 1)
-   endif()
--- 
-1.7.10.4
-

diff --git a/cmake-tests.patch b/cmake-tests.patch
deleted file mode 100644 (file)
index 04b31cf..0000000
--- a/cmake-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cmake-2.8.12.1/Tests/CMakeLists.txt.orig   2013-11-05 20:07:23.000000000 +0100
-+++ cmake-2.8.12.1/Tests/CMakeLists.txt        2013-11-08 15:52:51.604058079 +0100
-@@ -2216,6 +2216,7 @@
-   set(regex "(Problems when submitting via S*CP")
-   set(regex "${regex}|Error message was: ")
-   set(regex "${regex}([Cc]ould *n.t resolve host")
-+  set(regex "${regex}|[Cc]ould *n.t resolve:")
-   set(regex "${regex}|[Cc]ould *n.t connect to host")
-   set(regex "${regex}|Empty reply from server")
-   set(regex "${regex}|The requested URL returned error")

diff --git a/cmake.spec b/cmake.spec
index 2347de36463034c48cab04be8eab8254809373ee..0c239ea5bbc2c4226306cf4436efaf67b3384931 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -14,17 +14,16 @@
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
-Version:       3.2.3
-Release:       2
+Version:       3.3.2
+Release:       1
 License:       BSD
 Group:         Development/Building
-Source0:       http://www.cmake.org/files/v3.2/%{name}-%{version}.tar.gz
-# Source0-md5: d51c92bf66b1e9d4fe2b7aaedd51377c
+Source0:       http://www.cmake.org/files/v3.3/%{name}-%{version}.tar.gz
+# Source0-md5: 5febbd11bcaac854a27eebaf4a124be2
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-helpers.patch
 Patch2:                %{name}-findruby.patch
-Patch3:                %{name}-tests.patch
-Patch4:                cmake-min-ver.patch
+
 Patch5:                %{name}-findruby2.patch
 Patch6:                %{name}-findpython.patch
 Patch7:                %{name}-libx32.patch
@@ -118,8 +117,7 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %endif
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
 %patch5 -p1
 %patch6 -p1
 %if "%{_lib}" == "libx32"