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

[Mat Booth]

commit b4c919c55e9116d3ca110d7f24cbf8db0dfef50c
Merge: 8483c9d 11428b5
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Sep 30 10:21:19 2014 +0100

    Merge latest from F21

 eclipse-gef.spec |   16 ++++++++++------
 get-gef.sh       |    2 +-
 sources          |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --cc eclipse-gef.spec
index 2f90fe9,6437613..a2fb3c9
--- a/eclipse-gef.spec
+++ b/eclipse-gef.spec
@@@ -1,17 -1,12 +1,15 @@@
 +%{?scl:%scl_package eclipse-gef}
 +%{!?scl:%global pkg_name %{name}}
 +
  %global eclipse_dropin   %{_datadir}/eclipse/dropins
  
- # There is no tag in the upstream repository, but this revision
- # is the one that the maintenance branch was created at so this
- # is sort of a "post-release snapshot"
- %global git_version b63ec56b20b75fc5af90fbb1e85911bed35997dc
+ # Release has not been tagged, but this commit comprised the release
+ %global git_version f4eada958b82a6a8c4edff8e0f12cdad47b79c28
  
 -Name:      eclipse-gef
 +Name:      %{?scl_prefix}eclipse-gef
- Version:   3.9.100
+ Version:   3.9.101
  
- Release:   1.gitb63ec56.1%{?dist}
 -Release:   1%{?dist}
++Release:   1.1%{?dist}
  Summary:   Graphical Editing Framework (GEF) Eclipse plug-in
  Group:     System Environment/Libraries
  License:   EPL
@@@ -131,9 -120,9 +129,15 @@@ mv org.eclipse.gef.repository/target/re
  %doc org.eclipse.gef.examples-feature/epl-v10.html
  
  %changelog
++* Tue Sep 30 2014 Mat Booth <mat.booth at redhat.com> - 3.9.101-1.1
++- Merge latest from F21
++
+ * Tue Sep 30 2014 Mat Booth <mat.booth at redhat.com> - 3.9.101-1
+ - Update to 3.9.101
+ 
 +* Fri Jul 18 2014 Mat Booth <mat.booth at redhat.com> - 3.9.100-1.gitb63ec56.1
 +- SCL-ise
 +
  * Mon Jun 30 2014 Mat Booth <mat.booth at redhat.com> - 3.9.100-1.gitb63ec56
  - Update to latest upstream release
  - Add a script to make smaller source tarballs