[kdevelop] Update to 4.3.80 (beta 1)

[Radek Novacek]

commit 3bf68075c73da785f6807f81dd38a6eae635891e
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Thu Aug 9 13:46:48 2012 +0200

    Update to 4.3.80 (beta 1)
    
    - Rebase no-rpath patch
    - Drop okteta09 patch (upstreamed)

 .gitignore                     |    3 +-
 kdevelop-4.3.0-no-rpath.patch  |   11 -
 kdevelop-4.3.1-okteta09.patch  |  776 ----------------------------------------
 kdevelop-4.3.80-no-rpath.patch |   11 +
 kdevelop.spec                  |   19 +-
 sources                        |    2 +-
 6 files changed, 23 insertions(+), 799 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5bd45f..016e883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/kdevelop-4.2.3.tar.bz2
-/kdevelop-4.3.0.tar.bz2
 /kdevelop-4.3.1.tar.bz2
+/kdevelop-4.3.80.tar.bz2
diff --git a/kdevelop-4.3.80-no-rpath.patch b/kdevelop-4.3.80-no-rpath.patch
new file mode 100644
index 0000000..b7cf60a
--- /dev/null
+++ b/kdevelop-4.3.80-no-rpath.patch
@@ -0,0 +1,11 @@
+diff -up kdevelop-4.3.80/CMakeLists.txt.no-rpath kdevelop-4.3.80/CMakeLists.txt
+--- kdevelop-4.3.80/CMakeLists.txt.no-rpath	2012-08-09 13:41:43.651354379 +0200
++++ kdevelop-4.3.80/CMakeLists.txt	2012-08-09 13:41:50.590528091 +0200
+@@ -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.80 REQUIRED)
+ 
diff --git a/kdevelop.spec b/kdevelop.spec
index f525a60..21fb00d 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -1,28 +1,25 @@
 
-%define kdevplatform_ver 1.3.1
+%define kdevplatform_ver 1.3.80
 
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kdevelop.org/
 Group:   Development/Tools
-Source0: ftp://ftp.kde.org/pub/kde/stable/kdevelop/%{version}/src/kdevelop-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/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.3.0-no-rpath.patch
+Patch0:  kdevelop-4.3.80-no-rpath.patch
 
 # upstreamable patches
 Patch50: kdevelop-4.3.0-big_endian.patch
 
 # upstream patches
-# enable the Okteta plugin with Okteta 0.9 (kdesdk 4.9) and make it build
-# patch posted to kde-packager by Friedrich W. H. Kossebau
-Patch100: kdevelop-4.3.1-okteta09.patch
 
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
@@ -88,7 +85,6 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver}
 %setup -q -n kdevelop-%{version}
 %patch0 -p1 -b .no-rpath
 %patch50 -p1 -b .bigendian
-%patch100 -p1 -b .okteta09
 
 %build
 mkdir -p %{_target_platform}
@@ -159,6 +155,11 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %changelog
+* Thu Aug 09 2012 Radek Novacek <rnovacek at redhat.com> 9:4.3.80-1
+- Update to 4.3.80 (beta 1)
+- Rebase no-rpath patch
+- Drop okteta09 patch (upstreamed)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9:4.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 1358aa9..288f47e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6126e49562dcfb8e78a0f1b052a1ce19  kdevelop-4.3.1.tar.bz2
+ba45caadc1a8022ef97a198ae9ef6e10  kdevelop-4.3.80.tar.bz2