[kdevelop] * Sat Dec 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 9:4.2.3-7 - remove set(CMAKE_INSTALL_RPATH_U
Kevin Kofler
kkofler at fedoraproject.org
Sat Dec 24 12:19:57 UTC 2011
commit 0a149773f94ee8820ce7655e9ce431dc879357b0
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Dec 24 13:19:47 2011 +0100
* Sat Dec 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 9:4.2.3-7
- remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line
kdevelop-4.2.3-no-rpath.patch | 11 +++++++++++
kdevelop.spec | 9 ++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/kdevelop-4.2.3-no-rpath.patch b/kdevelop-4.2.3-no-rpath.patch
new file mode 100644
index 0000000..5ac3bcf
--- /dev/null
+++ b/kdevelop-4.2.3-no-rpath.patch
@@ -0,0 +1,11 @@
+diff -ur kdevelop-4.2.3/CMakeLists.txt kdevelop-4.2.3-no-rpath/CMakeLists.txt
+--- kdevelop-4.2.3/CMakeLists.txt 2011-06-24 21:09:33.000000000 +0200
++++ kdevelop-4.2.3-no-rpath/CMakeLists.txt 2011-12-24 12:59:59.000000000 +0100
+@@ -23,7 +23,6 @@
+ if("${_isSystemLibDir}" STREQUAL "-1")
+ set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+ endif("${_isSystemLibDir}" STREQUAL "-1")
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+ find_package(KDevPlatform 1.2.0 REQUIRED)
+
diff --git a/kdevelop.spec b/kdevelop.spec
index ff757ad..d0714e4 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -5,7 +5,7 @@ Name: kdevelop
Summary: Integrated Development Environment for C++/C
Epoch: 9
Version: 4.2.3
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2
URL: http://www.kdevelop.org/
@@ -13,6 +13,9 @@ Group: Development/Tools
Source0: ftp://ftp.kde.org/pub/kde/stable/kdevelop/%{version}/src/kdevelop-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line
+Patch0: kdevelop-4.2.3-no-rpath.patch
+
## Upstream patches
# compile Okteta plugin also with libs from Okteta 0.8 (kdesdk 4.8)
# (Friedrich W. H. Kossebau)
@@ -87,6 +90,7 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver}
%prep
%setup -q -n kdevelop-%{version}
+%patch0 -p1 -b .no-rpath
%patch100 -p1 -b .okteta08
@@ -158,6 +162,9 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
%changelog
+* Sat Dec 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 9:4.2.3-7
+- remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line
+
* Sat Dec 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 9:4.2.3-6
- upstream patch to make Okteta plugin compile against libs from Okteta 0.8
More information about the scm-commits
mailing list