[kdevelop] Add previously removed rpath patch
Jan Grulich
jgrulich at fedoraproject.org
Fri Apr 26 06:42:07 UTC 2013
commit 98075d1d7a0a29643ecf015808df8ee54a56ecdd
Author: Jan Grulich <jgrulich at redhat.com>
Date: Fri Apr 26 08:41:58 2013 +0200
Add previously removed rpath patch
kdevelop-4.4.90-no-rpath.patch | 11 +++++++++++
kdevelop.spec | 11 +++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/kdevelop-4.4.90-no-rpath.patch b/kdevelop-4.4.90-no-rpath.patch
new file mode 100644
index 0000000..0d8f205
--- /dev/null
+++ b/kdevelop-4.4.90-no-rpath.patch
@@ -0,0 +1,11 @@
+--- kdevelop-4.4.90/CMakeLists.txt 2013-04-18 02:19:29.000000000 +0200
++++ kdevelop-4.4.90_patch/CMakeLists.txt 2013-04-26 08:28:26.779838706 +0200
+@@ -23,7 +23,7 @@ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_D
+ if("${_isSystemLibDir}" STREQUAL "-1")
+ set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+ endif("${_isSystemLibDir}" STREQUAL "-1")
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+ find_package(KDevPlatform 1.4.60 REQUIRED)
+
diff --git a/kdevelop.spec b/kdevelop.spec
index fdd6e38..f9654e6 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -5,7 +5,7 @@ Name: kdevelop
Summary: Integrated Development Environment for C++/C
Epoch: 9
Version: 4.4.90
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
URL: http://www.kdevelop.org/
@@ -13,6 +13,9 @@ Group: Development/Tools
Source0: http://download.kde.org/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.4.90-no-rpath.patch
+
# upstreamable patches
# upstream patches
@@ -80,6 +83,7 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver}
%prep
%setup -q -n kdevelop-%{version}
+%patch0 -p1 -b .no-rpath
%build
mkdir -p %{_target_platform}
@@ -153,7 +157,10 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
%changelog
-* Thu Apr 25 2013 Jan Grulich <jgrulich at redhat.com> - 9:4.4.90-4
+* Fri Apr 26 2013 Jan Grulich <jgrulich at redhat.com> - 9:4.4.90-2
+- Add previusly removed rpath patch
+
+* Thu Apr 25 2013 Jan Grulich <jgrulich at redhat.com> - 9:4.4.90-1
- Update to 4.4.90 (RC1)
* Mon Apr 01 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:4.4.1-4
More information about the scm-commits
mailing list