From: Adam Gołębiowski <adamg@pld-linux.org>
Date: Tue, 19 Mar 2019 05:20:06 +0000 (+0100)
Subject: - updated to 3.14.0
X-Git-Tag: auto/th/cmake-3.14.0-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=commitdiff_plain;h=b094c172b589323b6f7e68a60bea875e76e0c953

- updated to 3.14.0
---

diff --git a/cmake-xmlrpc.patch b/cmake-xmlrpc.patch
deleted file mode 100644
index 6b8809c..0000000
--- a/cmake-xmlrpc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- cmake-3.8.0/CMakeLists.txt.orig	2017-04-10 17:23:06.000000000 +0200
-+++ cmake-3.8.0/CMakeLists.txt	2017-04-26 22:06:31.968941358 +0200
-@@ -539,13 +539,15 @@
-   #---------------------------------------------------------------------
-   # Build XMLRPC library for CMake and CTest.
-   if(CTEST_USE_XMLRPC)
-+    find_package(XMLRPC QUIET REQUIRED)
-+    set(XMLRPC_BASE_LIBRARIES ${XMLRPC_BASE_LIBRARIES})
-     find_package(XMLRPC QUIET REQUIRED libwww-client)
-     if(NOT XMLRPC_FOUND)
-       message(FATAL_ERROR
-         "CTEST_USE_XMLRPC is ON but xmlrpc is not found!")
-     endif()
-     set(CMAKE_XMLRPC_INCLUDES ${XMLRPC_INCLUDE_DIRS})
--    set(CMAKE_XMLRPC_LIBRARIES ${XMLRPC_LIBRARIES})
-+    set(CMAKE_XMLRPC_LIBRARIES ${XMLRPC_LIBRARIES} ${XMLRPC_BASE_LIBRARIES})
-   endif()
- 
-   #---------------------------------------------------------------------
diff --git a/cmake.spec b/cmake.spec
index eb6ed4d..7cc43e1 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -19,20 +19,17 @@
 Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
-Version:	3.13.0
+Version:	3.14.0
 Release:	1
 License:	BSD
 Group:		Development/Building
-Source0:	https://cmake.org/files/v3.13/%{name}-%{version}.tar.gz
-# Source0-md5:	14455874345a458345d8e72856ccc04f
+Source0:	https://cmake.org/files/v3.14/%{name}-%{version}.tar.gz
+# Source0-md5:	7504e4f3e05b59e083f2127e07059d5d
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-libx32.patch
 Patch2:		%{name}-helpers.patch
 Patch3:		%{name}-findruby.patch
 Patch4:		%{name}-findruby2.patch
-Patch5:		man-syntax.patch
-
-Patch7:		%{name}-xmlrpc.patch
 URL:		https://cmake.org/
 %if %{with gui}
 BuildRequires:	Qt5Core-devel >= 5.0
@@ -136,9 +133,6 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-
-%patch7 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -201,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/cmake-compile-features.7*
 %{_mandir}/man7/cmake-developer.7*
 %{_mandir}/man7/cmake-env-variables.7*
+%if %{with xml_rpc}
+%{_mandir}/man7/cmake-file-api.7*
+%endif
 %{_mandir}/man7/cmake-generator-expressions.7*
 %{_mandir}/man7/cmake-generators.7*
 %{_mandir}/man7/cmake-language.7*
diff --git a/man-syntax.patch b/man-syntax.patch
deleted file mode 100644
index a295e9f..0000000
--- a/man-syntax.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake-3.4.3/Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst~	2016-01-25 17:57:19.000000000 +0100
-+++ cmake-3.4.3/Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst	2016-02-27 17:06:46.607202361 +0100
-@@ -1,8 +1,8 @@
- ANDROID_NATIVE_LIB_DIRECTORIES
- ------------------------------
- 
--Set the Android property that specifies directories to search for the
--.so libraries.
-+Set the Android property that specifies directories to search for the .so
-+libraries.
- 
- This a string property that contains the directory paths separated
- by semicolons.