[soprano/f17] better/upstreamed rpath patch

[Rex Dieter]

commit b82644d8a5e17e6ec12c62a08998a0165cc6308f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun May 20 13:40:27 2012 -0500

    better/upstreamed rpath patch

 soprano-2.5.63-rpath.patch |   16 ----------------
 soprano-2.7.6-rpath.patch  |   18 ++++++++++++++++++
 soprano.spec               |    6 +++---
 3 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/soprano-2.7.6-rpath.patch b/soprano-2.7.6-rpath.patch
new file mode 100644
index 0000000..091d1b5
--- /dev/null
+++ b/soprano-2.7.6-rpath.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ac2108f..cb26fb7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,8 +142,13 @@ set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig
+ # These two options below make it set the RPATH of the installed targets to all
+ # RPATH directories outside the current CMAKE_BINARY_DIR and also the library
+ # install directory. Alex
++list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemPlatformLibDir)
++list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemCLibDir)
++list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemCxxLibDir)
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
++if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+ set(CMAKE_INSTALL_RPATH                ${LIB_DESTINATION} )
++endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+ 
+ if(APPLE)
+    set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION})
diff --git a/soprano.spec b/soprano.spec
index e38a3a3..4b9e172 100644
--- a/soprano.spec
+++ b/soprano.spec
@@ -23,10 +23,10 @@ Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
-# nuke rpaths
-Patch50: soprano-2.5.63-rpath.patch
 
 ## upstream patches
+# nuke standard libdirs from rpath
+Patch100: soprano-2.7.6-rpath.patch
 
 BuildRequires: clucene-core-devel >= 0.9.20-2
 BuildRequires: cmake
@@ -108,7 +108,7 @@ format for easy browsing.
 %prep
 %setup -q -n soprano-%{version}
 
-%patch50 -p1 -b .rpath
+%patch100 -p1 -b .rpath
 
 
 %build