[eclipse-emf/eclipse-luna: 2/3] Update to Luna SR1 release

[Mat Booth]

commit 710e84c8bd196b2124460c8234dda472c03f4fb0
Author: Mat Booth <mat.booth at redhat.com>
Date:   Wed Oct 1 13:13:15 2014 +0100

    Update to Luna SR1 release
    
    - Drop ancient obsoletes on emf-sdo package

 eclipse-emf.spec |   63 ++++++++++++++++++++++++-----------------------------
 sources          |    2 +-
 2 files changed, 30 insertions(+), 35 deletions(-)
---
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index a85bf3a..494d16f 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -1,22 +1,17 @@
 %{?scl:%scl_package eclipse-emf}
 %{!?scl:%global pkg_name %{name}}
 
-%if 0%{?rhel} >= 6
-%global debug_package %{nil}
-%endif
-
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
-%global git_tag R2_10_0
-%global context_qualifier v20140625-1130
+%global git_tag R2_10_1
 
 %define __requires_exclude osgi*
 
 Name:      %{?scl_prefix}eclipse-emf
-Version:   2.10.0
+Version:   2.10.1
 Release:   1%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plug-in
 License:   EPL
-URL:       https://projects.eclipse.org/projects/modeling.emf.emf
+URL:       http://www.eclipse.org/modeling/emf/
 
 Source0:   http://git.eclipse.org/c/emf/org.eclipse.emf.git/snapshot/org.eclipse.emf-%{git_tag}.tar.bz2
 
@@ -36,10 +31,6 @@ Requires:         jpackage-utils
 Requires:         %{?scl_prefix}eclipse-platform >= 1:4.4.0
 Requires:         %{name}-core
 
-# the SDO sub-project was terminated upstream and removed in EMF 2.5 (see eclipse.org bug #251402)
-Obsoletes:        %{name}-sdo < 2.5
-Obsoletes:        %{name}-sdo-sdk < 2.5
-
 #TODO: ODA, GWT and RAP components are not packaged.
 
 %description
@@ -56,7 +47,7 @@ Summary:   Eclipse EMF Core
 Obsoletes: eclipse-emf-core < 1:2.8.2
 
 %description core
-The core of Eclipse Modeling Framework (EMF) plug-in.
+EMF bundles required by eclipse-platform.
 
 %package   sdk
 Summary:   Eclipse EMF SDK
@@ -91,7 +82,7 @@ rm -rf features plugins doc examples
 %build
 # Note: We use forceContextQualifier because the docs plugins use custom build
 #       scripts and don't work otherwise.
-OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=%{context_qualifier}"
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=$(date +v%Y%m%d-%H%M)"
 
 # Work around pdebuild entering/leaving symlink it is unaware of.
 ln -s %{_builddir}/org.eclipse.emf-%{git_tag}/org.eclipse.emf.license-feature \
@@ -102,30 +93,30 @@ ln -s %{_builddir}/org.eclipse.emf-%{git_tag}/org.eclipse.emf.license-feature \
 # (i.e. we don't have to know when upstream adds a new plugin)
 
 # build core features
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.common -a "$OPTIONS"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.ecore -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.common -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.ecore -a "$OPTIONS"
 
 # build emf features - order is important
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.edit -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.common.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.edit.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.ecore.edit -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen.ecore -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping.ecore -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen.ecore.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.databinding -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.databinding.edit -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.converter -a "$OPTIONS" -d "eclipse-emf-core"
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.edit -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.common.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.edit.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.ecore.edit -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ecore -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ecore -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ecore.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.databinding -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.databinding.edit -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.converter -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS" -d "eclipse-emf-core"
 
 # build examples features
-%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.examples -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.examples -a "$OPTIONS" -d "eclipse-emf-core"
 
 %install
 install -d -m 755 %{buildroot}%{eclipse_dropin}
@@ -192,6 +183,10 @@ popd
 %{eclipse_dropin}/emf-examples
 
 %changelog
+* Wed Oct 01 2014 Mat Booth <mat.booth at redhat.com> - 2.10.1-1
+- Update to Luna SR1 release
+- Drop ancient obsoletes on emf-sdo package
+
 * Wed Jun 25 2014 Mat Booth <mat.booth at redhat.com> - 2.10.0-1
 - Update to latest upstream release
 - Fix obsoletes on emf-core package, rhbz #1095431
diff --git a/sources b/sources
index 52aadc4..d633365 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d5822598a5d8e57df4ccc634d8aa1e2  org.eclipse.emf-R2_10_0.tar.bz2
+aeb7e8684a13e5550fa2b7ab874a679c  org.eclipse.emf-R2_10_1.tar.bz2