[eclipse-emf] Update to latest upstream, Kepler SR2

Fri Mar 14 17:21:12 UTC 2014

commit 035580c7339782a378604986d87eeffb4fc786f1
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Fri Mar 14 17:14:39 2014 +0000

    Update to latest upstream, Kepler SR2
    
    - Drop requires on java, rhbz #1068039
    - Remove unused patch
    - Update project URL

 .gitignore                      |    3 +--
 eclipse-emf-make-homeless.patch |   30 ------------------------------
 eclipse-emf.spec                |   22 +++++++++++-----------
 get-emf.sh                      |   22 ++++++----------------
 sources                         |    2 +-
 5 files changed, 19 insertions(+), 60 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 70e1d70..47660bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-emf-2.6.0.tar.gz
-emf-2.6.1.tar.gz
 /emf-2.7.0.tar.gz
 /emf-2.7.1.tar.gz
 /emf-2.8.0.tar.gz
@@ -16,3 +14,4 @@ emf-2.8.0.tar.gz
 /emf-R2_9_0.tar.gz
 /emf-2.9.0.tar.gz
 /emf-R2_9_1.tar.gz
+/emf-R2_9_2.tar.gz
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index 8ffb529..ca550f1 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -7,18 +7,18 @@
 %endif
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
-%global emf_tag R2_9_1
-%global context_qualifier v20130930-0823
+%global emf_tag R2_9_2
+%global context_qualifier v20131212-0545
 
 %define __requires_exclude osgi*
 
 Name:      %{?scl_prefix}eclipse-emf
-Version:   2.9.1
+Version:   2.9.2
 Release:   1%{?dist} 
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
-URL:       http://www.eclipse.org/modeling/emf/
+URL:       https://projects.eclipse.org/projects/modeling.emf.emf
 
 # source tarball and the script used to generate it from upstream's source control
 # script usage:
@@ -26,8 +26,6 @@ URL:       http://www.eclipse.org/modeling/emf/
 Source0:   emf-%{emf_tag}.tar.gz
 Source1:   get-emf.sh
 
-# don't depend on ANT_HOME and JAVA_HOME environment vars, patch upstream
-#Patch0:    %{name}-make-homeless.patch
 # look inside correct directory for platform docs
 Patch1:    %{pkg_name}-platform-docs-location.patch
 # Build docs correctly
@@ -44,7 +42,6 @@ BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
 BuildRequires:    %{?scl_prefix}eclipse-pde >= 1:4.2.0
 BuildRequires:    dos2unix
-Requires:         java
 Requires:         jpackage-utils
 Requires:         %{?scl_prefix}eclipse-platform >= 1:4.2.0
 Requires:         %{name}-core
@@ -71,7 +68,6 @@ basic editor.
 Epoch:      1
 Summary:   Eclipse EMF Core
 Group:     System Environment/Libraries
-Requires:  java
 Obsoletes: eclipse-emf-core < 1:2.8.0-20
 
 %description core
@@ -123,8 +119,6 @@ plugins.
 %prep
 %setup -q -n emf-%{version}
 %patch1 -p0 -b .orig
-#https://bugs.eclipse.org/bugs/show_bug.cgi?id=406981
-#%patch2 -p1 -b .orig
 %patch3 -p1 -b .orig
 %patch4 -p1 -b .orig
 %patch5
@@ -281,6 +275,12 @@ popd
 %{eclipse_dropin}/emf-examples
 
 %changelog
+* Wed Mar 12 2014 Mat Booth <fedora at matbooth.co.uk> - 2.9.2-1
+- Update to latest upstream, Kepler SR2
+- Drop requires on java, rhbz #1068039
+- Remove unused patch
+- Update project URL
+
 * Mon Sep 30 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:2.9.1-1
 - Update to latest upstream.  
 
@@ -323,7 +323,7 @@ popd
 * Wed Sep 12 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:2.8.0-17
 - Avoid generating automatic OSGi dependencies.
 
-* Tue Aug 15 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:2.8.0-16
+* Wed Aug 15 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:2.8.0-16
 - Removed obsolete.
 
 * Tue Aug 14 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:2.8.0-15
diff --git a/get-emf.sh b/get-emf.sh
index 556db46..6c276b3 100755
--- a/get-emf.sh
+++ b/get-emf.sh
@@ -1,27 +1,17 @@
 #!/bin/sh
 #actual tag to checkout
-TAG=R2_9_1
-XSD_TAG=R2_9_0
+TAG=R2_9_2
+XSD_TAG=R2_9_2
 #name of the version to put in the source
-VERSION=2.9.1
+VERSION=2.9.2
 
 rm -rf org.eclipse.emf
 rm -rf org.eclipse.xsd
 rm -rf emf-$VERSION
 
-git clone git://git.eclipse.org/gitroot/emf/org.eclipse.emf.git
-pushd org.eclipse.emf
-  git checkout $TAG
-popd
+git clone -b $TAG git://git.eclipse.org/gitroot/emf/org.eclipse.emf.git
+git clone -b $XSD_TAG git://git.eclipse.org/gitroot/xsd/org.eclipse.xsd.git
 
-git clone git://git.eclipse.org/gitroot/xsd/org.eclipse.xsd.git
-pushd org.eclipse.xsd
-  git checkout $XSD_TAG
-popd
-
-
-#mv org.eclipse.test emf-$VERSION/
-#mv org.eclipse.ant.optional.junit emf-$VERSION/
 mkdir emf-$VERSION/
 mv org.eclipse.emf/{doc,examples,features,plugins,tests}/* emf-$VERSION/
 cp -fr org.eclipse.xsd/{doc,examples,features,plugins}/* emf-$VERSION/
@@ -29,4 +19,4 @@ tar czf emf-$TAG.tar.gz emf-$VERSION
 
 rm -rf org.eclipse.emf
 rm -rf org.eclipse.xsd
-rm -rf emf-$VERSION/
\ No newline at end of file
+rm -rf emf-$VERSION/
diff --git a/sources b/sources
index 9dc4580..06f1f17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35b66dd24cbf64d072909e321eca702a  emf-R2_9_1.tar.gz
+883adc4d9728e64ee4f28f47ec2e1da1  emf-R2_9_2.tar.gz
