[eclipse-dltk/eclipse-luna: 3/3] Merge changes from latest F21

[Mat Booth]

commit 69fbc6c79abe324c0c645d77d37a0a42557a2c4f
Merge: 891e9dc 80581f0
Author: Mat Booth <mat.booth at redhat.com>
Date:   Fri Sep 5 09:50:56 2014 +0100

    Merge changes from latest F21

 eclipse-dltk.spec |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
---
diff --cc eclipse-dltk.spec
index be0a68f,06c9e90..6d95f44
--- a/eclipse-dltk.spec
+++ b/eclipse-dltk.spec
@@@ -1,13 -1,8 +1,13 @@@
 +%{?scl:%scl_package eclipse-dltk}
 +%{!?scl:%global pkg_name %{name}}
 +
  %global eclipse_dropin   %{_datadir}/eclipse/dropins
  
 -Name:      eclipse-dltk
 +%define __requires_exclude osgi*
 +
 +Name:      %{?scl_prefix}eclipse-dltk
  Version:   5.1.0
- Release:   1.1%{?dist}
 -Release:   2%{?dist}
++Release:   2.1%{?dist}
  Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plug-in
  License:   EPL
  URL:       http://www.eclipse.org/dltk/
@@@ -218,9 -225,9 +228,15 @@@ pop
  %doc org.eclipse.dltk.core/core/features/org.eclipse.dltk.core.sdk/rootfiles/*
  
  %changelog
++* Fri Sep 05 2014 Mat Booth <mat.booth at redhat.com> - 5.1.0-2.1
++- Merge changes from latest F21
++
+ * Thu Sep 04 2014 Mat Booth <mat.booth at redhat.com> - 5.1.0-2
+ - Unzip feature bundles on installation
+ 
 +* Wed Jul 30 2014 Mat Booth <mat.booth at redhat.com> - 5.1.0-1.1
 +- SCL-ise
 +
  * Thu Jun 26 2014 Mat Booth <mat.booth at redhat.com> - 5.1.0-1
  - Update to latest upstream release