[eclipse-remote/eclipse-luna: 2/2] Merge latest changes from F21

[Mat Booth]

commit b1193295573793c91b5ed094836b118c2b262ce4
Merge: 3fc9772 810ead1
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Sep 30 09:38:16 2014 +0100

    Merge latest changes from F21

 eclipse-remote.spec |   12 ++++++++++--
 sources             |    2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --cc eclipse-remote.spec
index 07f0b16,240cb6d..a26ee55
--- a/eclipse-remote.spec
+++ b/eclipse-remote.spec
@@@ -1,12 -1,11 +1,14 @@@
 +%{?scl:%scl_package eclipse-remote}
 +%{!?scl:%global pkg_name %{name}}
 +
  %global eclipse_dropin %{_datadir}/eclipse/dropins
- %global git_tag R1_0
+ # Release has not been tagged, but this commit comprised the release
+ # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=445422
+ %global git_tag 137f306ed56470a5be5367b49df5422b2ac83c9a
  
 -Name:           eclipse-remote
 +Name:           %{?scl_prefix}eclipse-remote
- Version:        1.0.0
+ Version:        1.1.0
 -Release:        1%{?dist}
 +Release:        1.1%{?dist}
  Summary:        Eclipse Remote Services plug-in
  License:        EPL
  URL:            https://www.eclipse.org/ptp/
@@@ -53,9 -48,9 +55,15 @@@ xmvn -o org.fedoraproject:feclipse-mave
  %{eclipse_dropin}/remote
  
  %changelog
++* Tue Sep 30 2014 Mat Booth <mat.booth at redhat.com> - 1.1.0-1.1
++- Merge latest changes from F21
++
+ * Tue Sep 30 2014 Mat Booth <mat.booth at redhat.com> - 1.1.0-1
+ - Update to 1.1.0
+ 
 +* Sat Jul 19 2014 Mat Booth <mat.booth at redhat.com> - 1.0.0-1.1
 +- SCL-ise
 +
  * Fri Jun 27 2014 Mat Booth <mat.booth at redhat.com> - 1.0.0-1
  - Update to upstream released version
  - Add BR on eclipse-license