X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=blobdiff_plain;f=cmake.spec;h=e9994b030843a9e871d383805ae4389eb400de9f;hp=6fae0cec84554f7675ff6e05aef9c36ffe2c78b6;hb=c59c071de76d50c1e1bfd185a9a90155e03e0368;hpb=59787775a5da13fea0726d2ef6c42b6d5cfc4d4a

diff --git a/cmake.spec b/cmake.spec
index 6fae0ce..e9994b0 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -7,25 +7,28 @@
 # Conditional build:
 %bcond_with	bootstrap	# use internal versions of some libraries
 %bcond_without	gui		# don't build gui package
-#
+
 Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
-Version:	2.8.1
+Version:	2.8.5
 Release:	1
 License:	BSD
 Group:		Development/Building
 Source0:	http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-# Source0-md5:	a92ad653f9ccc1595d16cd9707f49acc
+# Source0-md5:	3c5d32cec0f4c2dc45f4c2e84f4a20c5
 Patch0:		%{name}-lib64.patch
+Patch1:		%{name}-tinfo.patch
 URL:		http://www.cmake.org/
 %{?with_gui:BuildRequires:	QtGui-devel}
+BuildRequires:	libarchive-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
 %{?with_gui:BuildRequires:	qt4-build}
 %{?with_gui:BuildRequires:	qt4-qmake}
 BuildRequires:	rpmbuild(macros) >= 1.167
 %{!?with_bootstrap:BuildRequires:	xmlrpc-c-devel >= 1.4.12-2}
+Requires:	filesystem >= 3.0-46
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,6 +67,7 @@ CMake.
 %if "%{_lib}" == "lib64"
 %patch0 -p1
 %endif
+%patch1 -p0
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -82,6 +86,7 @@ export LDFLAGS="%{rpmldflags}"
 	--init=init.cmake \
 	%{!?with_bootstrap:--system-libs} \
 	%{?with_gui:--qt-gui} \
+	--qt-qmake=/usr/bin/qmake-qt4 \
 	--verbose
 
 %{__make} VERBOSE=1
@@ -89,11 +94,10 @@ export LDFLAGS="%{rpmldflags}"
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/cmake
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
+rm -r $RPM_BUILD_ROOT%{_prefix}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -105,8 +109,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/cmake
 %attr(755,root,root) %{_bindir}/cpack
 %attr(755,root,root) %{_bindir}/ctest
-%{_mandir}/man1/*.1*
-%{_datadir}/cmake
+%{_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*
+# top cmake/Modules dirs belong to filesystem
+%{_datadir}/cmake/Modules/.NoDartCoverage
+%{_datadir}/cmake/Modules/*
+%{_datadir}/cmake/Templates
+%{_datadir}/cmake/include
 %dir %{_libdir}/cmake
 
 %if %{with gui}
@@ -116,4 +133,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mime/packages/cmakecache.xml
 %{_desktopdir}/CMake.desktop
 %{_pixmapsdir}/CMakeSetup32.png
+%{_mandir}/man1/cmake-gui.1*
 %endif