diff --git a/kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch b/kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch new file mode 100644 index 0000000..0b7f7c3 --- /dev/null +++ b/kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake +index 6d65e61..700d265 100644 +--- a/cmake/modules/FindKDE4Internal.cmake ++++ b/cmake/modules/FindKDE4Internal.cmake +@@ -1036,12 +1036,13 @@ if (UNIX) + set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR}) + else (APPLE) + # add our LIB_INSTALL_DIR to the RPATH (but only when it is not one of the standard system link +- # directories listed in CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) and use the RPATH figured out by cmake when compiling ++ # directories listed in CMAKE_{PLATFORM,CXX}_IMPLICIT_LINK_DIRECTORIES) and use the RPATH figured out by cmake when compiling + +- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir) +- if("${_isSystemLibDir}" STREQUAL "-1") ++ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir) ++ list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir) ++ if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1") + set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}") +- endif("${_isSystemLibDir}" STREQUAL "-1") ++ endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1") + + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) diff --git a/kdelibs.spec b/kdelibs.spec index c97f804..4b62ea7 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -20,7 +20,7 @@ Summary: KDE Libraries Version: 4.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Name: kdelibs Epoch: 6 @@ -131,6 +131,8 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch ## upstream Patch100: kdelibs-4.8.0-kde_version_string.patch +# don't set rpath on multiarch dirs, https://git.reviewboard.kde.org/r/103422 +Patch101: kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch ## security fix # Not Upstreamed? why not ? -- Rex @@ -325,6 +327,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage # upstream patches %patch100 -p1 -b .kde_version_string +%patch101 -p1 -b .cmake_cxx_implicit_link_directories # security fixes %patch200 -p1 -b .CVE-2009-2702 @@ -577,6 +580,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 18 2012 Rex Dieter 4.8.0-4 +- don't set rpath on multiarch dirs (kde review request #103422) + * Fri Feb 10 2012 Petr Pisar - 6:4.8.0-3 - Rebuild against PCRE 8.30