X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cmake.spec;h=e32693b883d40a440ae85c5f617274e026ae84b6;hb=3cf20b01c1c50fc3d5aeff3ae4f9064b5a5835fe;hp=bcd487747ad409733e9423f900786b0a7e1ec411;hpb=d6205a43012ba67f306b82f64adc665161d76b40;p=packages%2Fcmake.git

diff --git a/cmake.spec b/cmake.spec
index bcd4877..e32693b 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -1,5 +1,6 @@
 # TODO:
-# - extend libx32 patch to work also on 64-bit arch
+# - 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
@@ -14,30 +15,36 @@
 Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
-Version:	3.1.3
-Release:	3
+Version:	3.16.4
+Release:	1
 License:	BSD
 Group:		Development/Building
-Source0:	http://www.cmake.org/files/v3.1/%{name}-%{version}.tar.gz
-# Source0-md5:	5697a77503bb5636f4b4057dcc02aa32
+Source0:	https://cmake.org/files/v3.16/%{name}-%{version}.tar.gz
+# Source0-md5:	e3dacb6b612a6b06f7054c7fb4e18616
 Patch0:		%{name}-lib64.patch
-Patch1:		%{name}-helpers.patch
-Patch2:		%{name}-findruby.patch
-Patch3:		%{name}-tests.patch
-Patch4:		%{name}-bug-0015258.patch
-Patch5:		%{name}-findruby2.patch
-Patch6:		%{name}-findpython.patch
-Patch7:		%{name}-libx32.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
+URL:		https://cmake.org/
+%if %{with gui}
+BuildRequires:	Qt5Core-devel >= 5.0
+BuildRequires:	Qt5Gui-devel >= 5.0
+BuildRequires:	Qt5Widgets-devel >= 5.0
+%endif
+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:	qt5-build}
-%{?with_gui:BuildRequires:	qt5-qmake}
+%{?with_gui:BuildRequires:	qt5-build >= 5.0}
+%{?with_gui:BuildRequires:	qt5-qmake >= 5.0}
+BuildRequires:	rhash-devel
 BuildRequires:	rpmbuild(macros) >= 1.167
 %{?with_doc:BuildRequires:	sphinx-pdg}
-%{!?with_bootstrap:BuildRequires:	xmlrpc-c-devel >= 1.4.12-2}
+BuildRequires:	zlib-devel
 Requires:	filesystem >= 3.0-52
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -115,15 +122,12 @@ 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
-%patch6 -p1
-%if "%{_lib}" == "libx32"
-%patch7 -p1
-%endif
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -147,12 +151,13 @@ export LDFLAGS="%{rpmldflags}"
 	--init=init.cmake \
 	%{!?with_bootstrap:--system-libs} \
 	%{?with_gui:--qt-gui} \
-	--qt-qmake=/usr/bin/qmake-qt4 \
+	--qt-qmake=%{_bindir}/qmake-qt5 \
 	%{?with_doc:--sphinx-html} \
 	%{?with_doc:--sphinx-man} \
 	--verbose
 
-%{__make} VERBOSE=1
+%{__make} \
+	VERBOSE=1
 
 %{?with_tests:%{__make} test}
 
@@ -178,10 +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*
@@ -190,6 +198,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
@@ -213,8 +222,9 @@ rm -rf $RPM_BUILD_ROOT
 %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
 
@@ -224,6 +234,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/cmake
-%{_datadir}/bash-completion/completions/cpack
-%{_datadir}/bash-completion/completions/ctest
+%{bash_compdir}/cmake
+%{bash_compdir}/cpack
+%{bash_compdir}/ctest