From 9a9469635dec8a0b3931463581259c276567817c Mon Sep 17 00:00:00 2001 From: Jaroslav Reznik Date: Mar 12 2012 12:13:48 +0000 Subject: rebase no-rpath patch, remove unistd.h patch --- diff --git a/kdevelop-4.2.81-include-unistd-h.patch b/kdevelop-4.2.81-include-unistd-h.patch deleted file mode 100644 index 2cccd39..0000000 --- a/kdevelop-4.2.81-include-unistd-h.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up kdevelop-4.2.81/debuggers/gdb/unittests/debugeeslow.cpp.include-unistd-h kdevelop-4.2.81/debuggers/gdb/unittests/debugeeslow.cpp ---- kdevelop-4.2.81/debuggers/gdb/unittests/debugeeslow.cpp.include-unistd-h 2012-01-15 01:51:45.000000000 +0100 -+++ kdevelop-4.2.81/debuggers/gdb/unittests/debugeeslow.cpp 2012-01-25 08:37:38.341179180 +0100 -@@ -17,6 +17,7 @@ - */ - - #include -+#include - - void foo() { - static int i=0; diff --git a/kdevelop-4.2.81-no-rpath.patch b/kdevelop-4.2.81-no-rpath.patch deleted file mode 100644 index 7a0b392..0000000 --- a/kdevelop-4.2.81-no-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up kdevelop-4.2.81/CMakeLists.txt.no-rpath kdevelop-4.2.81/CMakeLists.txt ---- kdevelop-4.2.81/CMakeLists.txt.no-rpath 2012-01-23 11:57:24.890826586 +0100 -+++ kdevelop-4.2.81/CMakeLists.txt 2012-01-23 11:57:40.104206627 +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.2.80 REQUIRED) - 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