X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=blobdiff_plain;f=cmake.spec;h=adce3c4780acac2860076dd6ef7f6466591065e7;hp=05f8be5b51b199c862135d81abeb1082d3312c58;hb=ccca321d7885d8f4078d05bc5a6d02151ce07171;hpb=512f5d39b929e9692685925e4345ee507ae777b0

diff --git a/cmake.spec b/cmake.spec
index 05f8be5..adce3c4 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -1,17 +1,22 @@
+#
+# Conditional build:
+%bcond_with	bootstrap # use internal versions of some libraries
+#
 Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
-Version:	2.4.7
-Release:	1
+Version:	2.6.0
+Release:	0.1
 License:	BSD
 Group:		Development/Building
-Source0:	http://www.cmake.org/files/v2.4/%{name}-%{version}.tar.gz
-# Source0-md5:	4476c423b8f74266136964e42ea88028
-Patch0:		%{name}-ncurses.patch
+Source0:	http://www.cmake.org/files/v2.6/%{name}-%{version}.tar.gz
+# Source0-md5:	e95ae003672dfc6c8151a1ee49a0d4a6
+Patch1:		%{name}-lib64.patch
 URL:		http://www.cmake.org/HTML/Index.html
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	rpmbuild(macros) >= 1.167
+%{?!with_bootstrap:BuildRequires:	xmlrpc-c-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,10 +39,13 @@ dziedziczenie szablonów.
 
 %prep
 %setup -q
-%patch0 -p1
+%if "%{_lib}" == "lib64"
+%patch1 -p1
+%endif
 
 cat > "init.cmake" <<EOF
-SET (CURSES_INCLUDE_PATH "%{_includedir}/ncurses" CACHE PATH " " FORCE)
+SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
+SET (CMAKE_AR "%{__ar}" CACHE FILEPATH " " FORCE)
 EOF
 
 %build
@@ -45,11 +53,13 @@ export CC="%{__cc}"
 export CXX="%{__cxx}"
 export CFLAGS="%{rpmcflags}"
 export CXXFLAGS="%{rpmcxxflags}"
+export LDFLAGS="%{rpmldflags}"
 ./bootstrap \
 	--prefix=%{_prefix} \
 	--mandir=/share/man \
 	--datadir=/share/cmake \
 	--init=init.cmake \
+	%{?!with_bootstrap:--system-libs }\
 	--verbose
 
 %{__make}