[eclipse-mdt-uml2/f19] Update to latest upstream, fix FTBFS rhbz #913957.

[mbooth]

commit 58f35dbf937a665177dc856ecafd5be3681eef1f
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Sun Apr 21 17:07:09 2013 +0100

    Update to latest upstream, fix FTBFS rhbz #913957.

 .gitignore            |    1 +
 eclipse-mdt-uml2.spec |   32 ++++++++++++++++++++------------
 get-mdt-uml2.sh       |   16 ----------------
 sources               |    2 +-
 4 files changed, 22 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b718085..31352fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ mdt-uml2-3.0.1.tar.gz
 /mdt-uml2-3.1.0.tar.gz
 /mdt-uml2-4.0.0.tar.gz
 /.project
+/org.eclipse.uml2-Juno_SR2.tar.bz2
diff --git a/eclipse-mdt-uml2.spec b/eclipse-mdt-uml2.spec
index e743194..5247760 100644
--- a/eclipse-mdt-uml2.spec
+++ b/eclipse-mdt-uml2.spec
@@ -1,19 +1,16 @@
 %global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
+%global gittag Juno_SR2
 
 Name:      eclipse-mdt-uml2
-Version:   4.0.0
-Release:   2%{?dist}
+Version:   4.0.2
+Release:   1%{?dist}
 Summary:   Implementation of the UML2 OMG meta-model for Eclipse
 Group:     System Environment/Libraries
 License:   EPL
 URL:       http://www.eclipse.org/modeling/mdt/uml2
 
-# source tarball and the script used to generate it from upstream's source control
-# script usage:
-# $ sh get-mdt-uml2.sh
-Source0:   mdt-uml2-%{version}.tar.gz
-Source1:   get-mdt-uml2.sh
+Source0:   http://git.eclipse.org/c/uml2/org.eclipse.uml2.git/snapshot/org.eclipse.uml2-%{gittag}.tar.bz2
 
 BuildArch:        noarch
 
@@ -21,12 +18,12 @@ BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:4.2.0
 BuildRequires:    eclipse-emf >= 2.8.0
-BuildRequires:    eclipse-emf-validation
+BuildRequires:    eclipse-emf-validation >= 1.6.0-3
 Requires:         java
 Requires:         jpackage-utils
 Requires:         eclipse-platform >= 1:4.2.0
 Requires:         eclipse-emf >= 2.8.0
-Requires:         eclipse-emf-validation
+Requires:         eclipse-emf-validation >= 1.6.0-3
 
 %description
 UML2 is an EMF-based implementation of the Unified Modeling Language (UML) 2.x
@@ -37,10 +34,18 @@ of semantic models, test cases as a means of validating the specification and
 validation rules as a means of defining and enforcing levels of compliance.
 
 %prep
-%setup -q -n mdt-uml2-%{version}
+%setup -q -n org.eclipse.uml2-%{gittag}
+
+# remove stuff we're not building
+rm -rf deprecated/ examples/ tests/
 
 # remove spurious exec permissions from docs
-find -wholename "*/rootfiles/*" | xargs chmod -x
+chmod -x releng/org.eclipse.uml2.license-feature/rootfiles/*
+
+# this copy works around ant not honouring symlinks
+cp -pr releng/org.eclipse.uml2.license-feature releng/org.eclipse.uml2.license
+mv releng/org.eclipse.uml2.license* plugins/.
+mv doc/org.eclipse.uml2.doc* plugins/.
 
 %build
 # build mdt-uml2 features
@@ -55,9 +60,12 @@ unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-uml2 build/rpmBuild/org.eclipse
 
 %files
 %{eclipse_dropin}/mdt-uml2
-%doc org.eclipse.uml2.license-feature/rootfiles/*
+%doc plugins/org.eclipse.uml2.license-feature/rootfiles/*
 
 %changelog
+* Sun Apr 21 2013 Mat Booth <fedora at matbooth.co.uk> - 4.0.2-1
+- Update to latest upstream, fix FTBFS rhbz #913957.
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index f9ea070..f4e160b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ab137ba95d31664ace4d119a52f2abf  mdt-uml2-4.0.0.tar.gz
+546b883edf2f39e568d4c8cfab4f9d11  org.eclipse.uml2-Juno_SR2.tar.bz2