X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=blobdiff_plain;f=cmake.spec;h=e3dba8da13448b8d64148573297bcbbebd412fae;hp=e554ae2a02ade85ddda3fb4d3b7ade56d4fe7f2d;hb=5fa6b389191ff7885c4f959c33fbcf19dbb380c5;hpb=69d19c0861e29fc478fb1223d44ea308961095d6

diff --git a/cmake.spec b/cmake.spec
index e554ae2..e3dba8d 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -1,4 +1,6 @@
 # TODO:
+# - system kwiml?
+# - make lib64/libx32 patch changes applicable everywhere
 # - any valid CMAKE_BUILD_TYPE causes overriding of our optflags
 #   (and default non-verbose makefiles are hiding it!)
 # - rpmldflags/rpmcppflags are not passed through %%cmake macro at all
@@ -7,27 +9,50 @@
 # 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:	2.8.9
+Version:	3.11.4
 Release:	1
 License:	BSD
 Group:		Development/Building
-Source0:	http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-# Source0-md5:	801f4c87f8b604f727df5bf1f05a59e7
+Source0:	https://cmake.org/files/v3.11/%{name}-%{version}.tar.gz
+# Source0-md5:	72e168b3bad2f9c34dcebbad7af56ff0
 Patch0:		%{name}-lib64.patch
-Patch1:		%{name}-helpers.patch
-URL:		http://www.cmake.org/
-%{?with_gui:BuildRequires:	QtGui-devel}
+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:	expat-devel
+BuildRequires:	jsoncpp-devel >= 1.6.2-2
 BuildRequires:	libarchive-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libuv-devel
 BuildRequires:	ncurses-devel > 5.9-3
-%{?with_gui:BuildRequires:	qt4-build}
-%{?with_gui:BuildRequires:	qt4-qmake}
+%{?with_gui:BuildRequires:	qt5-build >= 5.0}
+%{?with_gui:BuildRequires:	qt5-qmake >= 5.0}
+BuildRequires:	rhash-devel
 BuildRequires:	rpmbuild(macros) >= 1.167
-%{!?with_bootstrap:BuildRequires:	xmlrpc-c-devel >= 1.4.12-2}
+%{?with_doc:BuildRequires:	sphinx-pdg}
+%{?with_xmlrpc:BuildRequires:	xmlrpc-c-devel >= 1.4.12-2}
+%{!?with_xmlrpc:BuildRequires:	zlib-devel}
 Requires:	filesystem >= 3.0-52
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -49,6 +74,17 @@ dość wyrafinowany: może obsłużyć złożone środowiska wymagające
 konfiguracji systemu, generowanie preprocesora, generowanie kodu i
 dziedziczenie szablonów.
 
+%package doc-html
+Summary:	CMake documentation in HTML format
+Summary(pl.UTF-8):	Dokumentacja do pakietu CMake w formacie HTML
+Group:		Documentation
+
+%description doc-html
+CMake documentation in HTML format.
+
+%description doc-html -l pl.UTF-8
+Dokumentacja do pakietu CMake w formacie HTML.
+
 %package gui
 Summary:	Qt GUI for CMake
 Summary(pl.UTF-8):	Graficzny interfejs użytkownika Qt dla CMake
@@ -78,6 +114,10 @@ Summary:	bash-completion for cmake
 Summary(pl.UTF-8):	Bashowe dopełnianie parametrów dla cmake'a
 Group:		Applications/Shells
 Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion >= 2.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n bash-completion-%{name}
 bash-completion for cmake.
@@ -90,7 +130,15 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %if "%{_lib}" == "lib64"
 %patch0 -p1
 %endif
+%if "%{_lib}" == "libx32"
 %patch1 -p1
+%endif
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+%patch7 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -98,6 +146,9 @@ SET (CMAKE_INSTALL_SYSCONFDIR "%{_sysconfdir}" CACHE PATH " " FORCE)
 SET (CMAKE_INSTALL_DATADIR "%{_datadir}" CACHE PATH " " FORCE)
 EOF
 
+# cleanup backups after patching, modules are copied as-is
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
 %build
 export CC="%{__cc}"
 export CXX="%{__cxx}"
@@ -111,14 +162,19 @@ export LDFLAGS="%{rpmldflags}"
 	--init=init.cmake \
 	%{!?with_bootstrap:--system-libs} \
 	%{?with_gui:--qt-gui} \
-	--qt-qmake=/usr/bin/qmake-qt4 \
-	--verbose
+	--qt-qmake=%{_bindir}/qmake-qt5 \
+	%{?with_doc:--sphinx-html} \
+	%{?with_doc:--sphinx-man} \
+	--verbose \
+	-- \
+	%{?with_xmlrpc:-DCTEST_USE_XMLRPC=ON}
 
 %{__make} VERBOSE=1
 
+%{?with_tests:%{__make} test}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -129,35 +185,56 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog.* Copyright.txt *.gif Docs/{cmake,ctest}.{txt,html}
+%doc Copyright.txt README.rst *.gif
 %attr(755,root,root) %{_bindir}/ccmake
 %attr(755,root,root) %{_bindir}/cmake
 %attr(755,root,root) %{_bindir}/cpack
 %attr(755,root,root) %{_bindir}/ctest
+%if %{with doc}
 %{_mandir}/man1/ccmake.1*
 %{_mandir}/man1/cmake.1*
-%{_mandir}/man1/cmakecommands.1*
-%{_mandir}/man1/cmakecompat.1*
-%{_mandir}/man1/cmakemodules.1*
-%{_mandir}/man1/cmakepolicies.1*
-%{_mandir}/man1/cmakeprops.1*
-%{_mandir}/man1/cmakevars.1*
 %{_mandir}/man1/cpack.1*
 %{_mandir}/man1/ctest.1*
+%{_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-generator-expressions.7*
+%{_mandir}/man7/cmake-generators.7*
+%{_mandir}/man7/cmake-language.7*
+%{_mandir}/man7/cmake-modules.7*
+%{_mandir}/man7/cmake-packages.7*
+%{_mandir}/man7/cmake-policies.7*
+%{_mandir}/man7/cmake-properties.7*
+%{_mandir}/man7/cmake-qt.7*
+%{_mandir}/man7/cmake-server.7*
+%{_mandir}/man7/cmake-toolchains.7*
+%{_mandir}/man7/cmake-variables.7*
+%{_datadir}/cmake/Help
+%endif
 # top cmake/Modules dirs belong to filesystem
 %{_datadir}/cmake/Modules/.NoDartCoverage
 %{_datadir}/cmake/Modules/*
 %{_datadir}/cmake/Templates
+%{_datadir}/cmake/editors
 %{_datadir}/cmake/include
 %{_aclocaldir}/cmake.m4
 
+%if %{with doc}
+%files doc-html
+%defattr(644,root,root,755)
+%doc Utilities/Sphinx/html/*
+%endif
+
 %if %{with gui}
 %files gui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cmake-gui
 %{_datadir}/mime/packages/cmakecache.xml
-%{_desktopdir}/CMake.desktop
-%{_pixmapsdir}/CMakeSetup32.png
+%{_desktopdir}/cmake-gui.desktop
+%{_iconsdir}/hicolor/128x128/apps/CMakeSetup.png
+%{_iconsdir}/hicolor/32x32/apps/CMakeSetup.png
 %{_mandir}/man1/cmake-gui.1*
 %endif
 
@@ -167,6 +244,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
-/etc/bash_completion.d/cmake
-/etc/bash_completion.d/cpack
-/etc/bash_completion.d/ctest
+%{bash_compdir}/cmake
+%{bash_compdir}/cpack
+%{bash_compdir}/ctest