[cmake/el5/master] Drop CMAKE_SKIP_RPATH=ON from cmake macro, as in master

Orion Poplawski orion at fedoraproject.org
Wed Aug 18 22:49:04 UTC 2010


commit 2ca73bf8cf51ac70553ba7b686262e71cdd3a99c
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Aug 18 16:48:58 2010 -0600

    Drop CMAKE_SKIP_RPATH=ON from cmake macro, as in master

 cmake.spec   |    5 ++++-
 macros.cmake |    1 -
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/cmake.spec b/cmake.spec
index 85bf33f..5e303cc 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.6.4
-Release:        5%{?dist}.1
+Release:        5%{?dist}.2
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -136,6 +136,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Aug 18 2010 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-5.2
+- Drop CMAKE_SKIP_RPATH=ON from cmake macro, as in master
+
 * Tue Aug 17 2010 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-5.1
 - Build bootstrap - EL5 doesn't have xmlrpc-c yet
 - Don't build qui - qt is too old
diff --git a/macros.cmake b/macros.cmake
index e5f066e..cae6394 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -21,5 +21,4 @@
 %if "%{?_lib}" == "lib64" \
         %{?_cmake_lib_suffix64} \\\
 %endif \
-        %{?_cmake_skip_rpath} \\\
         -DBUILD_SHARED_LIBS:BOOL=ON


More information about the scm-commits mailing list