[kdevplatform] * Sat Dec 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.2.3-3 - remove set(CMAKE_INSTALL_RPATH_U
Kevin Kofler
kkofler at fedoraproject.org
Sat Dec 24 12:29:47 UTC 2011
commit d05236d3fee1792e243d68b89b0e5582ff16179f
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Dec 24 13:29:32 2011 +0100
* Sat Dec 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.2.3-3
- remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line
kdevplatform-1.2.3-no-rpath.patch | 11 +++++++++++
kdevplatform.spec | 12 ++++++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/kdevplatform-1.2.3-no-rpath.patch b/kdevplatform-1.2.3-no-rpath.patch
new file mode 100644
index 0000000..8249253
--- /dev/null
+++ b/kdevplatform-1.2.3-no-rpath.patch
@@ -0,0 +1,11 @@
+diff -ur kdevplatform-1.2.3/CMakeLists.txt kdevplatform-1.2.3-no-rpath/CMakeLists.txt
+--- kdevplatform-1.2.3/CMakeLists.txt 2011-06-24 21:03:56.000000000 +0200
++++ kdevplatform-1.2.3-no-rpath/CMakeLists.txt 2011-12-24 13:27:02.000000000 +0100
+@@ -29,7 +29,6 @@
+ if("${_isSystemLibDir}" STREQUAL "-1")
+ set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+ endif("${_isSystemLibDir}" STREQUAL "-1")
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+ set(KOMPARE_FOUND FALSE)
+ #macro_optional_find_package(Kompare)
diff --git a/kdevplatform.spec b/kdevplatform.spec
index e2c2289..d361992 100644
--- a/kdevplatform.spec
+++ b/kdevplatform.spec
@@ -2,12 +2,16 @@
Name: kdevplatform
Summary: Libraries for use by KDE development tools
Version: 1.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Development/Tools
License: GPLv2
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/kdevelop/4.2.3/src/kdevplatform-%{version}.tar.bz2
+
+# remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line
+Patch0: kdevplatform-1.2.3-no-rpath.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
@@ -49,6 +53,7 @@ Requires: subversion-devel
%prep
%setup -q -n kdevplatform-%{version}
+%patch0 -p1 -b .no-rpath
%build
@@ -110,7 +115,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
-* Sat Oct 08 2011 Rex Dieter <rdieter at fedoraproject.org> 1.2.3-2
+* Sat Dec 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.2.3-3
+- remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line
+
+* Sat Oct 08 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.2.3-2
- Requires: kate-part
* Mon Jun 27 2011 Radek Novacek <rnovacek at redhat.com> - 1.2.3-1
More information about the scm-commits
mailing list