[kdevelop] rebase no-rpath patch, remove unistd.h patch
Jaroslav Reznik
jreznik at fedoraproject.org
Mon Mar 12 12:13:58 UTC 2012
commit 9a9469635dec8a0b3931463581259c276567817c
Author: Jaroslav Reznik <jreznik at redhat.com>
Date: Mon Mar 12 13:13:48 2012 +0100
rebase no-rpath patch, remove unistd.h patch
kdevelop-4.2.81-include-unistd-h.patch | 11 -----------
kdevelop-4.2.81-no-rpath.patch | 11 -----------
kdevelop-4.3.0-no-rpath.patch | 11 +++++++++++
kdevelop.spec | 5 +----
4 files changed, 12 insertions(+), 26 deletions(-)
---
diff --git a/kdevelop-4.3.0-no-rpath.patch b/kdevelop-4.3.0-no-rpath.patch
new file mode 100644
index 0000000..dc9ea49
--- /dev/null
+++ b/kdevelop-4.3.0-no-rpath.patch
@@ -0,0 +1,11 @@
+diff -up kdevelop-4.3.0/CMakeLists.txt.no-rpath kdevelop-4.3.0/CMakeLists.txt
+--- kdevelop-4.3.0/CMakeLists.txt.no-rpath 2012-03-11 19:07:05.000000000 +0100
++++ kdevelop-4.3.0/CMakeLists.txt 2012-03-12 13:09:56.141329508 +0100
+@@ -23,7 +23,6 @@ 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)
+
+ find_package(KDevPlatform 1.3.0 REQUIRED)
+
diff --git a/kdevelop.spec b/kdevelop.spec
index e6bc87f..4aa8620 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -14,9 +14,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/kdevelop/%{version}/src/kdevelop-%{ver
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line
-Patch0: kdevelop-4.2.81-no-rpath.patch
-# Include unistd.h (gcc 4.7 issue)
-Patch1: kdevelop-4.2.81-include-unistd-h.patch
+Patch0: kdevelop-4.3.0-no-rpath.patch
BuildRequires: boost-devel
BuildRequires: desktop-file-utils
@@ -81,7 +79,6 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver}
%prep
%setup -q -n kdevelop-%{version}
%patch0 -p1 -b .no-rpath
-%patch1 -p1 -b .include-unistd-h
%build
More information about the scm-commits
mailing list