rpms/kdelibs/devel kdelibs-4.3.98-no_rpath.patch, 1.1, 1.2 kdelibs.spec, 1.580, 1.581

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv374

Modified Files:
	kdelibs-4.3.98-no_rpath.patch kdelibs.spec 
Log Message:
* Tue Feb 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-3
- respin no_rpath patch, add LIB_INSTALL_DIR rpath only if not in 
  CMAKE_SYSTEM_LIBRARY_PATH.  added some status messages to help debug.


kdelibs-4.3.98-no_rpath.patch:
 FindKDE4Internal.cmake |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

Index: kdelibs-4.3.98-no_rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.3.98-no_rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdelibs-4.3.98-no_rpath.patch	1 Feb 2010 20:01:45 -0000	1.1
+++ kdelibs-4.3.98-no_rpath.patch	2 Feb 2010 15:53:56 -0000	1.2
@@ -1,12 +1,21 @@
-diff -up kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpaths kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake
---- kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpaths	2010-02-01 13:47:32.891702874 -0600
-+++ kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake	2010-02-01 13:49:06.814704269 -0600
-@@ -947,10 +947,10 @@ if (UNIX)
+diff -up kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath	2010-02-02 08:56:04.117624211 -0600
++++ kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake	2010-02-02 09:51:15.752373945 -0600
+@@ -947,10 +947,19 @@ if (UNIX)
        set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
     else (APPLE)
        # add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
 -      set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
 +      # set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
++      message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH: ${CMAKE_SYSTEM_LIBRARY_PATH}")
++      message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
++      list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR} _LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
++      message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH: ${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
++      if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
++        message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
++        list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
++      endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
++
        set(CMAKE_SKIP_BUILD_RPATH FALSE)
        set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 -      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -p -r1.580 -r1.581
--- kdelibs.spec	1 Feb 2010 20:01:45 -0000	1.580
+++ kdelibs.spec	2 Feb 2010 15:53:56 -0000	1.581
@@ -6,7 +6,7 @@
 
 Summary: KDE Libraries
 Version: 4.3.98
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -452,6 +452,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Feb 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-3
+- respin no_rpath patch, add LIB_INSTALL_DIR rpath only if not in 
+  CMAKE_SYSTEM_LIBRARY_PATH.  added some status messages to help debug.
+
 * Mon Feb 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-2
 - no_rpath patch, goodbye -DCMAKE_SKIP_RPATH:BOOL=ON, it's been fun