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

[Mat Booth]

commit 90496fd5d3242adcaf217c988ddf48e498424992
Merge: 920a64e 2c1651e
Author: Mat Booth <mat.booth at redhat.com>
Date:   Wed Oct 1 16:17:46 2014 +0100

    Merge latest from F21

 ...build.properties-files-including-non-exit.patch |   58 --------------------
 0002-Migrate-to-shared-license.patch               |    4 +-
 eclipse-xsd.spec                                   |   24 +++++----
 sources                                            |    2 +-
 4 files changed, 17 insertions(+), 71 deletions(-)
---
diff --cc eclipse-xsd.spec
index 56d3c2b,ce23df1..765ed72
--- a/eclipse-xsd.spec
+++ b/eclipse-xsd.spec
@@@ -1,13 -1,10 +1,13 @@@
 +%{?scl:%scl_package eclipse-xsd}
 +%{!?scl:%global pkg_name %{name}}
 +
  %global eclipse_dropin   %{_datadir}/eclipse/dropins
  
- %global git_tag R2_10_0
+ %global git_tag R2_10_1
  
 -Name:      eclipse-xsd
 +Name:      %{?scl_prefix}eclipse-xsd
- Version:   2.10.0
- Release:   2.1%{?dist}
+ Version:   2.10.1
 -Release:   1%{?dist}
++Release:   1.1%{?dist}
  Summary:   XML Schema Definition (XSD) Eclipse plug-in
  License:   EPL
  URL:       http://www.eclipse.org/modeling/mdt/?project=xsd
@@@ -22,19 -18,18 +21,18 @@@ Patch1:    0003-438418-Migrate-to-tycho
  
  BuildArch:        noarch
  
- BuildRequires:    maven-local
 -BuildRequires:    tycho
 -BuildRequires:    tycho-extras
 -BuildRequires:    feclipse-maven-plugin
 -BuildRequires:    eclipse-pde >= 1:4.4.0
 -BuildRequires:    eclipse-emf-sdk >= 2.10.0
 -BuildRequires:    eclipse-license
 -Requires:         eclipse-platform >= 1:4.4.0
 -Requires:         eclipse-emf >= 2.10.0
 +BuildRequires:    %{?scl_prefix}tycho
 +BuildRequires:    %{?scl_prefix}tycho-extras
 +BuildRequires:    %{?scl_prefix}feclipse-maven-plugin
 +BuildRequires:    %{?scl_prefix}eclipse-pde >= 1:4.4.0
 +BuildRequires:    %{?scl_prefix}eclipse-emf-sdk >= 2.10.0
 +BuildRequires:    %{?scl_prefix}eclipse-license
 +Requires:         %{?scl_prefix}eclipse-platform >= 1:4.4.0
 +Requires:         %{?scl_prefix}eclipse-emf >= 2.10.0
  
  # Obsoletes/Provides added in F21
 -Provides:         eclipse-emf-xsd = %{version}-%{release}
 -Obsoletes:        eclipse-emf-xsd < %{version}-%{release}
 +Provides:         %{?scl_prefix}eclipse-emf-xsd = %{version}-%{release}
 +Obsoletes:        %{?scl_prefix}eclipse-emf-xsd < %{version}-%{release}
  
  %description
  The XML Schema Definition (XSD) plug-in is a library that provides an API for
@@@ -70,17 -65,13 +68,16 @@@ to use the XML Schema Definition (XSD) 
  find -name *.jar -exec rm -rf {} \;
  find -name *.class -exec rm -rf {} \;
  
+ %patch0 -p1
  %patch1 -p1
- %patch2 -p1
- %patch3 -p1
  
  %build
 +%{?scl:scl enable %{scl} - << "EOF"}
  xmvn -o clean verify
 +%{?scl:EOF}
  
  %install
 +%{?scl:scl enable %{scl} - << "EOF"}
  # Install main features
  xmvn -o org.fedoraproject:feclipse-maven-plugin:install \
    -Dfeatures=org.eclipse.xsd,org.eclipse.xsd.ecore.converter,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.mapping,org.eclipse.xsd.mapping.editor \
@@@ -118,9 -108,10 +115,16 @@@ rm %{buildroot}%{eclipse_dropin}/xsd-ex
  %{eclipse_dropin}/xsd-examples
  
  %changelog
++* Wed Oct 01 2014 Mat Booth <mat.booth at redhat.com> - 2.10.1-1.1
++- Merge latest from F21
++
+ * Wed Oct 01 2014 Mat Booth <mat.booth at redhat.com> - 2.10.1-1
+ - Update to Luna SR1 release
+ - Drop upstreamed patch
+ 
 +* Wed Aug 13 2014 Mat Booth <mat.booth at redhat.com> - 2.10.0-2.1
 +- Merge latest from f21 branch
 +
  * Wed Aug 13 2014 Mat Booth <mat.booth at redhat.com> - 2.10.0-2
  - Qualifier should be lexographically greater than upstream's