[eclipse-linuxtools/eclipse-luna: 5/5] Merge latest changes from f21

[Mat Booth]

commit 512b3afcce2e9407ca5cd62ed77ede5902da73fc
Merge: 586e2ed a850e16
Author: Mat Booth <mat.booth at redhat.com>
Date:   Thu Aug 14 10:47:18 2014 +0100

    Merge latest changes from f21

 eclipse-linuxtools.spec |   26 ++++++++-
 piechart.patch          |  140 +++++++++++++++++++++++++++++++++++++++++++++++
 toolpath-msgs.patch     |   12 ++++
 3 files changed, 176 insertions(+), 2 deletions(-)
---
diff --cc eclipse-linuxtools.spec
index 3f03550,bdeca15..72998f5
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@@ -1,11 -1,11 +1,13 @@@
  %{?scl:%scl_package eclipse-linuxtools}
  %{!?scl:%global pkg_name %{name}}
  
++%define __requires_exclude osgi*
++
  %global eclipse_dropin   %{_datadir}/eclipse/dropins
  
  Name:           %{?scl_prefix}eclipse-linuxtools
  Version:        3.0.0
- Release:        3.1%{?dist}
 -Release:        6%{?dist}
++Release:        6.1%{?dist}
  Summary:        Linux specific Eclipse plugins
  
  License:        EPL
@@@ -14,18 -14,22 +16,22 @@@ URL:            http://eclipse.org/linu
  Source0:        http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{version}.tar.bz2
  Patch0:         disable-libhover-lttng.patch
  Patch1:         rpm-menu.patch
+ Patch2:         piechart.patch
+ Patch3:         toolpath-msgs.patch
  
 -BuildRequires: tycho >= 0.20.0-6
 -BuildRequires: tycho-extras  
 +BuildRequires: %{?scl_prefix}tycho >= 0.20.0-6
 +BuildRequires: %{?scl_prefix}tycho-extras
  BuildRequires: %{?scl_prefix}eclipse-cdt
  BuildRequires: %{?scl_prefix}eclipse-jdt
- BuildRequires: swt-chart
+ BuildRequires: %{?scl_prefix}swt-chart >= 0.9.0
  BuildRequires: %{?scl_prefix}eclipse-remote
 -BuildRequires: eclipse-license
 -BuildRequires: maven-clean-plugin
 -BuildRequires: eclipse-swtbot
 +BuildRequires: %{?scl_prefix}eclipse-license
 +BuildRequires: %{?scl_prefix}eclipse-swtbot
  BuildRequires: %{?scl_prefix}eclipse-gef
 -BuildRequires: osgi(org.eclipse.ptp.remote.core)
  BuildRequires: exec-maven-plugin
  
++Requires: %{?scl_prefix}swt-chart >= 0.9.0
++
  BuildArch: noarch
  Obsoletes: %{?scl_prefix}eclipse-linuxprofilingframework < 2.0.0
  
@@@ -312,9 -309,16 +320,23 @@@ pop
  %{_javadir}/linuxtools-tests
  
  %changelog
++* Thu Aug 14 2014 Mat Booth <mat.booth at redhat.com> - 3.0.0-6.1
++- Merge latest changes from f21
++- Use scl-ised swt-chart
++
+ * Tue Aug 12 2014 Jeff Johnston <jjohnstn at redhat.com> 3.0.0-6
+ - Fix messages in tools path properties page.
+ - Fix commented out pie-chart patch.
+ 
+ * Wed Aug 06 2014 Jeff Johnston <jjohnstn at redhat.com> 3.0.0-5
+ - Modify piechart patch to prevent premature disposal of fonts.
+ 
+ * Thu Jul 24 2014 Jeff Johnston <jjohnstn at redhat.com> 3.0.0-4
+ - Fix piechart title centering for swt-chart 0.9 and higher.
+ 
 +* Thu Jul 24 2014 Mat Booth <mat.booth at redhat.com> - 3.0.0-3.1
 +- SCL-ise
 +
  * Thu Jul 24 2014 Sami Wagiaalla <swagiaal at redhat.com> 3.0.0-3
  - Disable createrepo tests.