rpms/cmake/F-10 cmake.spec,1.45,1.46 macros.cmake,1.2,1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/cmake/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28400

Modified Files:
	cmake.spec macros.cmake 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.3-3
- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053)
- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/cmake.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cmake.spec	22 Oct 2008 17:07:35 -0000	1.45
+++ cmake.spec	9 Jan 2009 12:48:57 -0000	1.46
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -130,6 +130,10 @@
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.3-3
+- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053)
+- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
+
 * Tue Oct 21 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-2
 - Allow conditional build of gui
 


Index: macros.cmake
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/macros.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- macros.cmake	27 Jun 2007 17:00:25 -0000	1.2
+++ macros.cmake	9 Jan 2009 12:48:57 -0000	1.3
@@ -2,6 +2,7 @@
 # Macros for cmake
 #
 %_cmake_lib_suffix64 -DLIB_SUFFIX=64
+%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
 %__cmake %{_bindir}/cmake
 
 %cmake \
@@ -9,6 +10,7 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %__cmake \\\
+        -DCMAKE_VERBOSE_MAKEFILE=ON \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
         -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
@@ -18,4 +20,5 @@
 %if "%{?_lib}" == "lib64" \
         %{?_cmake_lib_suffix64} \\\
 %endif \
+        %{?_cmake_skip_rpath} \\\
         -DBUILD_SHARED_LIBS:BOOL=ON