- added tests patch (fixes some curl-related failures; a few still exist, probably...

diff --git a/cmake-tests.patch b/cmake-tests.patch
new file mode 100644 (file)
index 0000000..04b31cf
--- /dev/null
+++ b/cmake-tests.patch
@@ -0,0 +1,10 @@
+--- 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 a8a1039ff104c540924c720f3ecc503f979e8f3a..f1b0830f8c1b4d5314777d737a5e3632615ae7a6 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -20,7 +20,8 @@ Source0:      http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
 # Source0-md5: 9d38cd4e2c94c3cea97d0e2924814acc
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-helpers.patch
 # Source0-md5: 9d38cd4e2c94c3cea97d0e2924814acc
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-helpers.patch

-Patch2:                cmake-findruby.patch
+Patch2:                %{name}-findruby.patch
+Patch3:                %{name}-tests.patch

 URL:           http://www.cmake.org/
 %{?with_gui:BuildRequires:     QtGui-devel}
 BuildRequires: libarchive-devel
 URL:           http://www.cmake.org/
 %{?with_gui:BuildRequires:     QtGui-devel}
 BuildRequires: libarchive-devel


@@ -95,6 +96,7 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %endif
 %patch1 -p1
 %patch2 -p1
 %endif
 %patch1 -p1
 %patch2 -p1

+%patch3 -p1

 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)