SPECS: cmake.spec - 2.6.0 (functionality of ncurses.patch included) - use P...

[draenog]

Author: draenog                      Date: Wed May 14 05:49:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.6.0 (functionality of ncurses.patch included)
- use PLD flags for linker
- set explicitly name of ar binary (as we don't provide e.g. 
  i686-pld-linux-ar)
- use system libraries when possible (boostrap bcond)

---- Files affected:
SPECS:
   cmake.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/cmake.spec
diff -u SPECS/cmake.spec:1.23 SPECS/cmake.spec:1.24
--- SPECS/cmake.spec:1.23	Thu Jan 31 10:57:06 2008
+++ SPECS/cmake.spec	Wed May 14 07:49:48 2008
@@ -1,19 +1,23 @@
 # $Revision$, $Date$
+#
+# 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.8
-Release:	3
+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:	f5dd061c31765a49dc17ae8bdc986779
-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
@@ -36,13 +40,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %if "%{_lib}" == "lib64"
 %patch1 -p1
 %endif
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
+SET (CMAKE_AR "%{__ar}" CACHE FILEPATH " " FORCE)
 EOF
 
 %build
@@ -50,11 +54,13 @@
 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}
@@ -86,6 +92,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2008-05-14 05:49:48  draenog
+- 2.6.0 (functionality of ncurses.patch included)
+- use PLD flags for linker
+- set explicitly name of ar binary (as we don't provide e.g.
+  i686-pld-linux-ar)
+- use system libraries when possible (boostrap bcond)
+
 Revision 1.23  2008-01-31 09:57:06  glen
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cmake.spec?r1=1.23&r2=1.24&f=u