cb0bd4bae3
* Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-4 - depend on version of phonon,strigi,soprano built against * Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-3 - respin * Mon Feb 08 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-2 - respin * Fri Feb 05 2010 Than Ngo <than@redhat.com> - 6:4.4.0-1 - 4.4.0 * Tue Feb 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-4 - -apidocs: build as normal noarch subpkg * Tue Feb 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-3 - respin no_rpath patch, add LIB_INSTALL_DIR rpath only if not in CMAKE_SYSTEM_LIBRARY_PATH. added some status messages to help debug. * Mon Feb 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-2 - no_rpath patch, goodbye -DCMAKE_SKIP_RPATH:BOOL=ON, it's been fun * Sun Jan 31 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-1 - KDE 4.3.98 (4.4rc3) * Wed Jan 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-3 - patch for kde4-config --kde-version option (kde#224540) * Tue Jan 26 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-2 - -devel: Obsoletes: webkitkde-devel * Wed Jan 20 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.3.95-1 - KDE 4.3.95 (4.4rc2) * Thu Jan 14 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-6 - use %%_polkit_qt_policydir - strigi_ver 0.7.1 * Mon Jan 11 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-5 - hopefully correct kauth fix (old polkit cmake module is broken) * Fri Jan 08 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-4 - fix kauth polkit policies installation * Thu Jan 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-3 - bump min polkit-qt version(s) * Wed Jan 06 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-2 - -devel: Requires: shared-desktop-ontologies-devel * Wed Jan 06 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-1 - 4.3.90 (4.4rc1) - drop openssl patch (no longer needed since bug #429846 fixed) * Tue Jan 05 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.85-7 - PolkitQt rebuild * Sun Dec 27 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-6 - Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80 * Sat Dec 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-5 - move kdecmake,makekdewidgets manpages to -devel (#549947) * Sat Dec 19 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-4 - tarball respin * Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-3 - -devel: Requires: attica-devel * Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-2 - plasma_scrollwidget patch * Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-1 - 4.3.85 (4.4 beta2) * Wed Dec 16 2009 Jaroslav Reznik <jreznik@redhat.com> - 4.3.80-5 - Repositioning the KDE Brand (#547361) * Wed Dec 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.80-4 - BR: attica-devel shared-desktop-ontologies-devel - phonon_ver 4.3.80 - soprano_ver 2.3.70 * Fri Dec 04 2009 Than Ngo <than@redhat.com> - 4.3.80-3 - respin * Thu Dec 03 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.3.80-2 - BR polkit-qt-devel - fix the build of the KAuth PolkitQt-1 backend (upstream patch) * Tue Dec 01 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.80-1 - KDE 4.4 beta1 (4.3.80) * Wed Nov 25 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.75-0.2.svn1048496 - -devel: Provides: kdelibs4-devel%{?_isa} ... - Obsoletes: kdelibs-experimental(-devel) < 4.3.75 * Fri Nov 20 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.75-0.1.svn1048496 - Update to 4.3.75 snapshot * Wed Nov 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.3-6 - rebuild (for qt-4.6.0-rc1, f13+) - fix/revert soprano_ver change in -5
26 lines
1.5 KiB
Diff
26 lines
1.5 KiB
Diff
diff -up kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake
|
|
--- kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-02-02 08:56:04.117624211 -0600
|
|
+++ kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake 2010-02-02 09:51:15.752373945 -0600
|
|
@@ -947,10 +947,19 @@ if (UNIX)
|
|
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
|
|
else (APPLE)
|
|
# add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
|
|
- set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
|
|
+ # set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
|
|
+ message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH: ${CMAKE_SYSTEM_LIBRARY_PATH}")
|
|
+ message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
|
|
+ list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR} _LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
|
|
+ message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH: ${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
|
|
+ if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
|
|
+ message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
|
|
+ list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
|
|
+ endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
|
|
+
|
|
set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
|
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
|
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
|
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
|
|
endif (APPLE)
|
|
endif (UNIX)
|
|
|