X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=blobdiff_plain;f=cmake.spec;h=34a0d9cbc60646605f32a387d1c37d309a609e48;hp=65bfc1493fe2935425d335ad5e5e1e4c07e7a814;hb=eead9c17da6fa3c540336735ee394e4e103a719a;hpb=552867d7339294bf68f9cc24d3dddd12f67b5052

diff --git a/cmake.spec b/cmake.spec
index 65bfc14..34a0d9c 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -7,18 +7,21 @@
 # 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:	1
+Version:	2.8.11.1
+Release:	2
 License:	BSD
 Group:		Development/Building
 Source0:	http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-# Source0-md5:	be6008f2299613d23fe82ab53ef7472e
+# Source0-md5:	df5324a3b203373a9e0a04b924281a43
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-helpers.patch
+Patch2:		cmake-findruby.patch
+Patch3:		cmake-git.patch
 URL:		http://www.cmake.org/
 %{?with_gui:BuildRequires:	QtGui-devel}
 BuildRequires:	libarchive-devel
@@ -91,6 +94,8 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -116,9 +121,10 @@ export LDFLAGS="%{rpmldflags}"
 
 %{__make} VERBOSE=1
 
+%{?with_tests:%{__make} test}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT