X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cmake.spec;h=2f563fdd9b248614371c3933edb4b2859bd267f2;hb=157d955ae3583b6d830e403adeea9750f033365e;hp=ef3e09557914d8d8939c0cf82bef05ad599e5d19;hpb=7d1b468256ae02fb8a04d1240c7e75a9005f1448;p=packages%2Fcmake.git

diff --git a/cmake.spec b/cmake.spec
index ef3e095..2f563fd 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -9,37 +9,30 @@
 # Conditional build:
 %bcond_with	bootstrap	# use internal versions of some libraries
 %bcond_without	gui		# don't build gui package
-%bcond_with	xmlrpc		# XMLRPC submission method in CTest
 %bcond_with	tests		# perform "make test"
 %bcond_without	doc		# don't build documentation
 
-%if %{with bootstrap}
-%undefine	with_xmlrpc
-%endif
 Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
-Version:	3.10.2
+Version:	3.14.1
 Release:	1
 License:	BSD
 Group:		Development/Building
-Source0:	https://cmake.org/files/v3.10/%{name}-%{version}.tar.gz
-# Source0-md5:	732808e17fc14dc8cee50d51518c34eb
+Source0:	https://cmake.org/files/v3.14/%{name}-%{version}.tar.gz
+# Source0-md5:	7efe5394e85c3292ad020b8b70e55669
 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
 BuildRequires:	Qt5Gui-devel >= 5.0
 BuildRequires:	Qt5Widgets-devel >= 5.0
 %endif
-%{!?with_xmlrpc:BuildRequires:	curl-devel}
+BuildRequires:	curl-devel
 BuildRequires:	expat-devel
 BuildRequires:	jsoncpp-devel >= 1.6.2-2
 BuildRequires:	libarchive-devel
@@ -51,8 +44,7 @@ BuildRequires:	ncurses-devel > 5.9-3
 BuildRequires:	rhash-devel
 BuildRequires:	rpmbuild(macros) >= 1.167
 %{?with_doc:BuildRequires:	sphinx-pdg}
-%{?with_xmlrpc:BuildRequires:	xmlrpc-c-devel >= 1.4.12-2}
-%{!?with_xmlrpc:BuildRequires:	zlib-devel}
+BuildRequires:	zlib-devel
 Requires:	filesystem >= 3.0-52
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -136,9 +128,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)
@@ -165,11 +154,10 @@ export LDFLAGS="%{rpmldflags}"
 	--qt-qmake=%{_bindir}/qmake-qt5 \
 	%{?with_doc:--sphinx-html} \
 	%{?with_doc:--sphinx-man} \
-	--verbose \
-	-- \
-	%{?with_xmlrpc:-DCTEST_USE_XMLRPC=ON}
+	--verbose
 
-%{__make} VERBOSE=1
+%{__make} \
+	VERBOSE=1
 
 %{?with_tests:%{__make} test}
 
@@ -195,11 +183,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/cmake.1*
 %{_mandir}/man1/cpack.1*
 %{_mandir}/man1/ctest.1*
+%{_mandir}/man7/cpack-generators.7*
 %{_mandir}/man7/cmake-buildsystem.7*
 %{_mandir}/man7/cmake-commands.7*
 %{_mandir}/man7/cmake-compile-features.7*
 %{_mandir}/man7/cmake-developer.7*
 %{_mandir}/man7/cmake-env-variables.7*
+%{_mandir}/man7/cmake-file-api.7*
 %{_mandir}/man7/cmake-generator-expressions.7*
 %{_mandir}/man7/cmake-generators.7*
 %{_mandir}/man7/cmake-language.7*