From 8b1c323beb7ce587e8c200370479ce0110742261 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Tue, 5 Nov 2013 20:56:00 -0600
Subject: [PATCH] use upstream version of rpath patch

---
 0003-fix-rpath-handling.patch | 35 +++++++++++++++++++++++++++++++++++
 phonon-4.7.0-rpath.patch      | 17 -----------------
 phonon.spec                   | 11 +++++++----
 3 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 0003-fix-rpath-handling.patch
 delete mode 100644 phonon-4.7.0-rpath.patch

diff --git a/0003-fix-rpath-handling.patch b/0003-fix-rpath-handling.patch
new file mode 100644
index 0000000..0fb25d6
--- /dev/null
+++ b/0003-fix-rpath-handling.patch
@@ -0,0 +1,35 @@
+From cf441af677beade70036453a6480d77d7e702346 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Tue, 5 Nov 2013 20:15:03 -0600
+Subject: [PATCH 3/3] fix rpath handling
+
+REVIEW: 113649
+---
+ cmake/FindPhononInternal.cmake | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
+index b48bfaf..3245e9b 100644
+--- a/cmake/FindPhononInternal.cmake
++++ b/cmake/FindPhononInternal.cmake
+@@ -217,10 +217,14 @@ endif(APPLE)
+ # RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
+ # install directory. Alex
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
+-list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
++set(_abs_LIB_INSTALL_DIR "${LIB_INSTALL_DIR}")
++if (NOT IS_ABSOLUTE "${_abs_LIB_INSTALL_DIR}")
++   set(_abs_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
++endif()
++list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
++list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemCxxLibDir)
+ if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+-   set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++   set(CMAKE_INSTALL_RPATH "${_abs_LIB_INSTALL_DIR}")
+ endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+ 
+ 
+-- 
+1.8.4.2
+
diff --git a/phonon-4.7.0-rpath.patch b/phonon-4.7.0-rpath.patch
deleted file mode 100644
index 7ec92fe..0000000
--- a/phonon-4.7.0-rpath.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up phonon-4.7.0/cmake/FindPhononInternal.cmake.rpath phonon-4.7.0/cmake/FindPhononInternal.cmake
---- phonon-4.7.0/cmake/FindPhononInternal.cmake.rpath	2013-11-04 10:49:06.000000000 -0600
-+++ phonon-4.7.0/cmake/FindPhononInternal.cmake	2013-11-04 19:29:26.793926526 -0600
-@@ -217,10 +217,10 @@ endif(APPLE)
- # RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
- # install directory. Alex
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
--list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
--list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
-+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
-+list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
- if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
--   set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
-+   set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
- endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
- 
- 
diff --git a/phonon.spec b/phonon.spec
index d189e4d..2932bc8 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -11,7 +11,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 %if 0%{?snap}
@@ -20,8 +20,8 @@ Source0: phonon-%{version}-%{snap}.tar.xz
 Source0: http://download.kde.org/stable/phonon/%{version}/phonon-%{version}.tar.xz
 %endif
 
-## upstreamable patches
-Patch50: phonon-4.7.0-rpath.patch 
+## upstream patches
+Patch0003: 0003-fix-rpath-handling.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.9
@@ -84,7 +84,7 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
 %prep
 %setup -q 
 
-%patch50 -p1 -b .rpath
+%patch0003 -p1 -b .0003
 
 
 %build
@@ -191,6 +191,9 @@ test "$(pkg-config --modversion phonon4qt5)" = "%{version}"
 
 
 %changelog
+* Tue Nov 05 2013 Rex Dieter <rdieter@fedoraproject.org> 4.7.0-2
+- use upstream version of rpath patch
+
 * Tue Nov 05 2013 Rex Dieter <rdieter@fedoraproject.org> 4.7.0-1
 - phonon-4.7.0, Qt5 support