really fix rpath handling

* Sun Nov 11 2013 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.7.0-4
- really fix rpath handling (the upstream version of the patch is incomplete)
epel9
Kevin Kofler 11 years ago
parent 897bb94bcd
commit 98cef139b6

@ -0,0 +1,11 @@
diff -ur phonon-4.7.0-fix-rpath-handling/cmake/FindPhononInternal.cmake phonon-4.7.0-really-fix-rpath-handling/cmake/FindPhononInternal.cmake
--- phonon-4.7.0-fix-rpath-handling/cmake/FindPhononInternal.cmake 2013-11-10 23:25:47.000000000 +0100
+++ phonon-4.7.0-really-fix-rpath-handling/cmake/FindPhononInternal.cmake 2013-11-10 23:28:10.000000000 +0100
@@ -216,7 +216,6 @@
# 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
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
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}")

@ -11,7 +11,7 @@
Summary: Multimedia framework api
Name: phonon
Version: 4.7.0
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2+
URL: http://phonon.kde.org/
%if 0%{?snap}
@ -20,6 +20,7 @@ Source0: phonon-%{version}-%{snap}.tar.xz
Source0: http://download.kde.org/stable/phonon/%{version}/phonon-%{version}.tar.xz
%endif
Patch0: phonon-4.7.0-really-fix-rpath-handling.patch
## upstream patches
Patch0003: 0003-fix-rpath-handling.patch
@ -85,6 +86,7 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
%setup -q
%patch0003 -p1 -b .0003
%patch0 -p1 -b .fix-rpath
%build
@ -191,6 +193,9 @@ test "$(pkg-config --modversion phonon4qt5)" = "%{version}"
%changelog
* Sun Nov 11 2013 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.7.0-4
- really fix rpath handling (the upstream version of the patch is incomplete)
* Wed Nov 06 2013 Rex Dieter <rdieter@fedoraproject.org> 4.7.0-3
- disable bootstrap

Loading…
Cancel
Save