[kdelibs] - squash more rpath's
Rex Dieter
rdieter at fedoraproject.org
Sun Nov 21 00:22:36 UTC 2010
commit 827dd60918ba817be1fcf15d49f321f738824445
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat Nov 20 18:23:22 2010 -0600
- squash more rpath's
kdelibs-4.4.80-no_rpath.patch | 26 ----------
kdelibs-4.5.80-no_rpath.patch | 107 +++++++++++++++++++++++++++++++++++++++++
kdelibs.spec | 12 ++---
3 files changed, 112 insertions(+), 33 deletions(-)
---
diff --git a/kdelibs-4.5.80-no_rpath.patch b/kdelibs-4.5.80-no_rpath.patch
new file mode 100644
index 0000000..23a95c0
--- /dev/null
+++ b/kdelibs-4.5.80-no_rpath.patch
@@ -0,0 +1,107 @@
+diff -up kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-11-20 16:28:26.945612607 -0600
++++ kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake 2010-11-20 18:18:01.926613935 -0600
+@@ -1042,7 +1042,7 @@ if (UNIX)
+
+ 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)
+
+diff -up kdelibs-4.5.80/kdewidgets/CMakeLists.txt.no_rpath kdelibs-4.5.80/kdewidgets/CMakeLists.txt
+--- kdelibs-4.5.80/kdewidgets/CMakeLists.txt.no_rpath 2010-11-20 16:28:26.784363550 -0600
++++ kdelibs-4.5.80/kdewidgets/CMakeLists.txt 2010-11-20 18:20:09.111363760 -0600
+@@ -46,14 +46,14 @@ if(QT_QTDESIGNER_FOUND)
+ kde4_add_plugin(kdewidgets ${kdewidgets_PART_SRCS})
+
+ target_link_libraries(kdewidgets ${KDE4_KIO_LIBS})
+- if(NOT WIN32)
+- set_target_properties(kdewidgets PROPERTIES
+- INSTALL_RPATH_USE_LINK_PATH TRUE
+- SKIP_BUILD_RPATH TRUE
+- BUILD_WITH_INSTALL_RPATH TRUE
+- INSTALL_RPATH ${LIB_INSTALL_DIR}
+- )
+- endif(NOT WIN32)
++# if(NOT WIN32)
++# set_target_properties(kdewidgets PROPERTIES
++# INSTALL_RPATH_USE_LINK_PATH TRUE
++# SKIP_BUILD_RPATH TRUE
++# BUILD_WITH_INSTALL_RPATH TRUE
++# INSTALL_RPATH ${LIB_INSTALL_DIR}
++# )
++# endif(NOT WIN32)
+
+ install(TARGETS kdewidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+
+@@ -76,14 +76,14 @@ if(QT_QTDESIGNER_FOUND)
+ kde4_add_plugin(kdedeprecated ${kdedeprecated_PART_SRCS})
+
+ target_link_libraries(kdedeprecated ${KDE4_KIO_LIBS})
+- if(NOT WIN32)
+- set_target_properties(kdedeprecated PROPERTIES
+- INSTALL_RPATH_USE_LINK_PATH TRUE
+- SKIP_BUILD_RPATH TRUE
+- BUILD_WITH_INSTALL_RPATH TRUE
+- INSTALL_RPATH ${LIB_INSTALL_DIR}
+- )
+- endif(NOT WIN32)
++# if(NOT WIN32)
++# set_target_properties(kdedeprecated PROPERTIES
++# INSTALL_RPATH_USE_LINK_PATH TRUE
++# SKIP_BUILD_RPATH TRUE
++# BUILD_WITH_INSTALL_RPATH TRUE
++# INSTALL_RPATH ${LIB_INSTALL_DIR}
++# )
++# endif(NOT WIN32)
+
+ install(TARGETS kdedeprecated DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+ endif(NOT KDE_NO_DEPRECATED)
+@@ -111,14 +111,14 @@ if(QT_QTDESIGNER_FOUND)
+ kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
+
+ target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
+- if(NOT WIN32)
+- set_target_properties(kdewebkitwidgets PROPERTIES
+- INSTALL_RPATH_USE_LINK_PATH TRUE
+- SKIP_BUILD_RPATH TRUE
+- BUILD_WITH_INSTALL_RPATH TRUE
+- INSTALL_RPATH ${LIB_INSTALL_DIR}
+- )
+- endif(NOT WIN32)
++# if(NOT WIN32)
++# set_target_properties(kdewebkitwidgets PROPERTIES
++# INSTALL_RPATH_USE_LINK_PATH TRUE
++# SKIP_BUILD_RPATH TRUE
++# BUILD_WITH_INSTALL_RPATH TRUE
++# INSTALL_RPATH ${LIB_INSTALL_DIR}
++# )
++# endif(NOT WIN32)
+
+ install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+
+@@ -147,14 +147,14 @@ if(QT_QTDESIGNER_FOUND)
+ kde4_add_plugin(kde3supportwidgets ${kde3supportwidgets_PART_SRCS})
+
+ target_link_libraries(kde3supportwidgets ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIO_LIBS})
+- if(NOT WIN32)
+- set_target_properties(kde3supportwidgets PROPERTIES
+- INSTALL_RPATH_USE_LINK_PATH TRUE
+- SKIP_BUILD_RPATH TRUE
+- BUILD_WITH_INSTALL_RPATH TRUE
+- INSTALL_RPATH ${LIB_INSTALL_DIR}
+- )
+- endif(NOT WIN32)
++# if(NOT WIN32)
++# set_target_properties(kde3supportwidgets PROPERTIES
++# INSTALL_RPATH_USE_LINK_PATH TRUE
++# SKIP_BUILD_RPATH TRUE
++# BUILD_WITH_INSTALL_RPATH TRUE
++# INSTALL_RPATH ${LIB_INSTALL_DIR}
++# )
++# endif(NOT WIN32)
+
+ install(TARGETS kde3supportwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+ endif (QT_QT3SUPPORT_FOUND)
diff --git a/kdelibs.spec b/kdelibs.spec
index 0791cbe..be25c26 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -12,7 +12,7 @@
Summary: KDE Libraries
Version: 4.5.80
-Release: 1%{?dist}
+Release: 2%{?dist}
Name: kdelibs
Epoch: 6
@@ -81,7 +81,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
# this extra hassle (even though cmake is *supposed* to not add standard
# paths (like /usr/lib64) already! With this, we can drop
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
-Patch27: kdelibs-4.4.80-no_rpath.patch
+Patch27: kdelibs-4.5.80-no_rpath.patch
## upstreamable
# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/
@@ -453,11 +453,6 @@ rm -rf %{buildroot}
%{_kde4_libexecdir}/start_kdeinit
%{_kde4_libexecdir}/start_kdeinit_wrapper
%{_kde4_libdir}/kde4/plugins/
-# FIXME: comes from rpath snippets in kdewidgets/CMakeLists.txt
-#ERROR 0001: file '/usr/lib64/kde4/plugins/designer/kde3supportwidgets.so' contains a standard rpath '/usr/lib64' in [/usr/lib64]
-#ERROR 0001: file '/usr/lib64/kde4/plugins/designer/kdedeprecated.so' contains a standard rpath '/usr/lib64' in [/usr/lib64]
-#ERROR 0001: file '/usr/lib64/kde4/plugins/designer/kdewebkitwidgets.so' contains a standard rpath '/usr/lib64' in [/usr/lib64]
-#ERROR 0001: file '/usr/lib64/kde4/plugins/designer/kdewidgets.so' contains a standard rpath '/usr/lib64' in [/usr/lib64]
%{_kde4_sysconfdir}/xdg/menus/*.menu
%{_mandir}/man1/checkXML.1*
%{_mandir}/man1/kde4-config.1*
@@ -512,6 +507,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Nov 20 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.80-2
+- squash more rpath's
+
* Sat Nov 20 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.80-1
- 4.5.80 (4.6beta1)
More information about the scm-commits
mailing list