rpms/kdelibs/F-11 kdelibs-4.4.1-no_rpath.patch, NONE, 1.1 kdelibs.spec, 1.518, 1.519 kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch, 1.1, NONE

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28231/F-11

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.4.1-no_rpath.patch 
Removed Files:
	kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch 
Log Message:
KDE 4.4.1


kdelibs-4.4.1-no_rpath.patch:
 FindKDE4Internal.cmake |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.4.1-no_rpath.patch ---
diff -up kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake.no_rpath	2010-02-28 11:08:56.164016085 -0600
+++ kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake	2010-02-28 11:10:20.126766912 -0600
@@ -947,7 +947,16 @@ 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)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -p -r1.518 -r1.519
--- kdelibs.spec	28 Feb 2010 14:10:25 -0000	1.518
+++ kdelibs.spec	2 Mar 2010 14:12:51 -0000	1.519
@@ -8,7 +8,7 @@
 
 Summary: KDE Libraries
 Version: 4.4.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -77,10 +77,6 @@ Patch18: kdelibs-4.1.72-kstandarddirs.pa
 Patch20: kdelibs-4.1.70-cmake.patch
 # disable drkonqi by default, RHEL prefers/wants abrt
 Patch24: kdelibs-4.3.1-drkonq.patch
-# use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
-# workaound for low-mem systems (ppc64), tracking here (for now),
-# https://bugzilla.redhat.com/show_bug.cgi?id=539697
-Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
 # die rpath die, since we're using standard paths, we can avoid
 # this extra hassle (even though cmake is *supposed* to not add standard
 # paths (like /usr/lib64) already! With this, we can drop
@@ -233,9 +229,6 @@ format for easy browsing.
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
-#if 0%{?fedora} > 11
-#patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
-#endif
 %patch27 -p1 -b .no_rpath
 
 # upstreamable patches
@@ -432,6 +425,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Feb 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.1-3
+- put back CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE to avoid 
+  %%_libdir/kde/devel rpaths (#568495)
+
+* Sun Feb 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.1-2
+- update no_rpath patch, revert back to 
+  CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE (#568495)
+
 * Sat Feb 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.1-1
 - 4.4.1
 


--- kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch DELETED ---