From 1703c4156e63ba2ba3cc06ca4fc0ef8167ad70a4 Mon Sep 17 00:00:00 2001
From: Radek Novacek <rnovacek@redhat.com>
Date: Jan 23 2012 11:02:23 +0000
Subject: Update to 4.2.81 (1.3 beta)


- Drop upstreamed patch
- Rebase rpath patch

---

diff --git a/.gitignore b/.gitignore
index 86bedc4..acdeba0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /kdevelop-4.2.0.tar.bz2
 /kdevelop-4.2.2.tar.bz2
 /kdevelop-4.2.3.tar.bz2
+/kdevelop-4.2.81.tar.bz2
diff --git a/kdevelop-4.2.3-no-rpath.patch b/kdevelop-4.2.3-no-rpath.patch
deleted file mode 100644
index 5ac3bcf..0000000
--- a/kdevelop-4.2.3-no-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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-4.2.81-no-rpath.patch b/kdevelop-4.2.81-no-rpath.patch
new file mode 100644
index 0000000..7a0b392
--- /dev/null
+++ b/kdevelop-4.2.81-no-rpath.patch
@@ -0,0 +1,11 @@
+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.spec b/kdevelop.spec
index a42e2eb..485b67f 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -4,8 +4,8 @@
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
-Version: 4.2.3
-Release: 8%{?dist}
+Version: 4.2.81
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kdevelop.org/
@@ -14,19 +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.3-no-rpath.patch
-
-## Upstream patches
-# compile Okteta plugin also with libs from Okteta 0.8 (kdesdk 4.8)
-# (Friedrich W. H. Kossebau)
-# cumulative patch from:
-# http://commits.kde.org/kdevelop/2d77d88856c78bd34690cae57042e7a314f446bf
-# http://commits.kde.org/kdevelop/14e0929d07b51b7bbccf802ef0a8502c9266140e
-# http://commits.kde.org/kdevelop/7b20bf4845ea5f85cb7ac8d24d30971f9b862d1d
-# http://commits.kde.org/kdevelop/1a0aeb55ff099d31fd6fe4f7e02c70f8c5f122ea
-# (The last is the fix, the others are minor CMake fixes on top of which the fix
-# applies.)
-Patch100: kdevelop-4.2.3-okteta08.patch
+Patch0:  kdevelop-4.2.81-no-rpath.patch
 
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
@@ -91,7 +79,6 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver}
 %prep
 %setup -q -n kdevelop-%{version}
 %patch0 -p1 -b .no-rpath
-%patch100 -p1 -b .okteta08
 
 
 %build
@@ -162,6 +149,11 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %changelog
+* Mon Jan 23 2012 Radek Novacek <rnovacek@redhat.com> 9:4.2.81-1
+- Update to 4.2.81 (1.3 beta)
+- Drop upstreamed patch
+- Rebase rpath patch
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9:4.2.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 71f5ab8..1b8243b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b6e59764612314e6776edb3386c0930  kdevelop-4.2.3.tar.bz2
+5114730407d4a16b88ab2fc633419c21  kdevelop-4.2.81.tar.bz2