[kdevelop/f17] Update to 4.5.1

[Jan Grulich]

commit 2334368e3673a2cf7a7fa7743864392f99e912b8
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Thu May 30 18:02:51 2013 +0200

    Update to 4.5.1

 .gitignore    |    3 +--
 kdevelop.spec |   17 ++++++++++++-----
 sources       |    3 ++-
 3 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8df6eab..a719c42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
 /kdevelop-4.3.1.tar.bz2
-/kdevelop-4.4.0.tar.bz2
-/kdevelop-4.4.1.tar.bz2
 /kdevelop-4.3.80.tar.bz2
 /kdevelop-4.3.90.tar.bz2
 /kdevelop-4.4.0.tar.bz2
 /kdevelop-4.4.1.tar.bz2
 /kdevelop-4.4.90.tar.bz2
 /kdevelop-4.5.0.tar.bz2
+/kdevelop-4.5.1.tar.bz2
diff --git a/kdevelop.spec b/kdevelop.spec
index b3b56dd..97bb492 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -1,11 +1,11 @@
 
-%define kdevplatform_ver 1.5.0
+%define kdevplatform_ver 1.5.1
 
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
-Version: 4.5.0
-Release: 2%{?dist}
+Version: 4.5.1
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kdevelop.org/
@@ -13,6 +13,7 @@ Group:   Development/Tools
 Source0: http://download.kde.org/stable/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.5.0-no-rpath.patch
 
 # upstreamable patches
@@ -131,7 +132,7 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.DOC COPYING.LIB ChangeLog TODO NEWS
+%doc AUTHORS COPYING COPYING.DOC COPYING.LIB CHANGELOG.4.5.1 TODO NEWS
 %{_kde4_bindir}/kdevelop
 %{_kde4_bindir}/kdevelop!
 %{_kde4_configdir}/kdeveloprc
@@ -160,7 +161,10 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %changelog
-* Mon Apr 29 2013 Radek Novacek <rnovacek at redhat.com> 9:4.5.0-2
+* Thu May 30 2013 Jan Grulich <jgrulich at redhat.com> - 9:4.5.1-1
+- Update to 4.5.1
+
+* Mon Apr 29 2013 Radek Novacek <rnovacek at redhat.com> - 9:4.5.0-2
 - Obsoletes and provides kdevelop-custom-buildsystem
 
 * Fri Apr 26 2013 Jan Grulich <jgrulich at redhat.com> - 9:4.5.0-1
@@ -192,9 +196,12 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 - Update to 4.4.0
 - Rebase no-rpath patch
 
+<<<<<<< HEAD
 * Mon Sep 10 2012 Rex Dieter <rdieter at fedoraproject.org> 9:4.3.1-2
 - rebuild for kde-4.9.x
 
+=======
+>>>>>>> f18
 * Fri Sep 07 2012 Radek Novacek <rnovacek at redhat.com> 9:4.3.90-1
 - Update to 4.3.90 (RC 1)
 
diff --git a/sources b/sources
index 2894f57..e3fbe89 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-7a16db527e0565e435975e929b682af3  kdevelop-4.5.0.tar.bz2
+9356d8faa06a027fb6854391b03ba4bd  kdevelop-4.5.1.tar.bz2
+