[soprano] - rebuild (gcc) - use upstreamable rpath fix

[Rex Dieter]

commit b4854419aa3202bcce735444ed6a2b3107cd109b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 25 12:25:51 2011 -0600

    - rebuild (gcc)
    - use upstreamable rpath fix

 soprano-2.5.63-rpath.patch |   16 ++++++++++++++++
 soprano.spec               |   12 ++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/soprano-2.5.63-rpath.patch b/soprano-2.5.63-rpath.patch
new file mode 100644
index 0000000..018451f
--- /dev/null
+++ b/soprano-2.5.63-rpath.patch
@@ -0,0 +1,16 @@
+diff -up soprano-2.5.63/CMakeLists.txt.rpath soprano-2.5.63/CMakeLists.txt
+--- soprano-2.5.63/CMakeLists.txt.rpath	2010-11-22 10:36:57.000000000 -0600
++++ soprano-2.5.63/CMakeLists.txt	2011-01-24 14:19:19.169375389 -0600
+@@ -136,7 +136,11 @@ set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_IN
+ # RPATH directories outside the current CMAKE_BINARY_DIR and also the library
+ # install directory. Alex
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+-set(CMAKE_INSTALL_RPATH                ${LIB_DESTINATION} )
++list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystem)
++if("${_isSystem}" LESS 0)
++  list(APPEND CMAKE_INSTALL_RPATH "${LIB_DESTINATION}")
++endif()
++
+ 
+ if(APPLE)
+    set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION})
diff --git a/soprano.spec b/soprano.spec
index f1d4b78..602ed7c 100644
--- a/soprano.spec
+++ b/soprano.spec
@@ -8,7 +8,7 @@
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
 Version: 2.5.63
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -22,6 +22,9 @@ Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+Patch50: soprano-2.5.63-rpath.patch
+
 BuildRequires: clucene-core-devel >= 0.9.20-2
 BuildRequires: cmake
 BuildRequires: kde-filesystem
@@ -105,6 +108,8 @@ format for easy browsing.
 %prep
 %setup -q -n soprano-%{version}
 
+%patch50 -p1 -b .rpath
+
 
 %build
 
@@ -118,7 +123,6 @@ export CXXFLAGS="%optflags -DQT_NO_DEBUG_OUTPUT"
   -DQT_DOC_DIR=%{?_qt4_docdir}%{!?_qt4_docdir:%(pkg-config --variable=docdir Qt)} \
   -DSOPRANO_BUILD_API_DOCS:BOOL=%{!?apidocs:0}%{?apidocs} \
   -DSOPRANO_BUILD_TESTS:BOOL=%{!?tests:FALSE}%{?tests} \
-  %{?_cmake_skip_rpath} \
   .. 
 popd
 
@@ -217,6 +221,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 25 2011 Rex Dieter <rdieter at fedoraproject.org> 2.5.63-3
+- rebuild (gcc)
+- use upstreamable rpath fix
+
 * Tue Nov 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.5.63-2
 - soprano-2.5.63 (release)