X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=cmake.spec;h=39401dbb72b28a303c3a4f34eb7bf79755015082;hb=a048aac345ef36ef6b1d5fab4bb64a38cc82daee;hp=f731c9cc9c322b8b0c2bb15395688c0c283c7048;hpb=fe667d6f5aa32d980f622e8818ec9b4e54bf767d;p=packages%2Fcmake.git

diff --git a/cmake.spec b/cmake.spec
index f731c9c..39401db 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -7,19 +7,23 @@
 # Conditional build:
 %bcond_with	bootstrap	# use internal versions of some libraries
 %bcond_without	gui		# don't build gui package
+%bcond_without	tests		# do not perform "make test"
 
 Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
-Version:	2.8.11
-Release:	2
+Version:	2.8.12.2
+Release:	1
 License:	BSD
 Group:		Development/Building
 Source0:	http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-# Source0-md5:	be6008f2299613d23fe82ab53ef7472e
+# Source0-md5:	17c6513483d23590cbce6957ec6d1e66
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-helpers.patch
-Patch2:		cmake-findruby.patch
+Patch2:		%{name}-findruby.patch
+Patch3:		%{name}-tests.patch
+Patch4:		%{name}-freetype2.patch
+Patch5:		%{name}-findruby2.patch
 URL:		http://www.cmake.org/
 %{?with_gui:BuildRequires:	QtGui-devel}
 BuildRequires:	libarchive-devel
@@ -79,6 +83,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.
@@ -93,6 +101,9 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %endif
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -118,6 +129,8 @@ export LDFLAGS="%{rpmldflags}"
 
 %{__make} VERBOSE=1
 
+%{?with_tests:%{__make} test}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
@@ -169,6 +182,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
+%{_datadir}/bash-completion/completions/cmake
+%{_datadir}/bash-completion/completions/cpack
+%{_datadir}/bash-completion/completions/ctest