[eclipse-mdt-ocl] - Update to latest upstream. - Fix FTBFS rhbz #913956.

[mbooth]

commit 76ced43f005d0f9cd1c04c686fb5f1bef400106f
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Tue Feb 26 15:53:53 2013 +0000

    - Update to latest upstream.
    - Fix FTBFS rhbz #913956.

 .gitignore            |    1 +
 eclipse-mdt-ocl.spec  |   35 ++++++++++++++++++++++++-----------
 fix-icu-version.patch |   13 +++++++++++++
 get-mdt-ocl.sh        |   16 ----------------
 sources               |    2 +-
 5 files changed, 39 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b253a5c..86e7be9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 mdt-ocl-3.0.0.tar.gz
 /mdt-ocl-4.0.0.tar.gz
 /.project
+/org.eclipse.ocl-R4_0_2.tar.bz2
diff --git a/eclipse-mdt-ocl.spec b/eclipse-mdt-ocl.spec
index cf4645f..0c70c0b 100644
--- a/eclipse-mdt-ocl.spec
+++ b/eclipse-mdt-ocl.spec
@@ -1,19 +1,19 @@
 %global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
+%global gittag R4_0_2
 
 Name:      eclipse-mdt-ocl
-Version:   4.0.0
-Release:   2%{?dist}
+Version:   4.0.2
+Release:   1%{?dist}
 Summary:   Implementation of the OCL OMG meta-model for Eclipse
 Group:     System Environment/Libraries
 License:   EPL
 URL:       http://www.eclipse.org/modeling/mdt/ocl
 
-# source tarball and the script used to generate it from upstream's source control
-# script usage:
-# $ sh get-mdt-ocl.sh
-Source0:   mdt-ocl-%{version}.tar.gz
-Source1:   get-mdt-ocl.sh
+Source0:   http://git.eclipse.org/c/mdt/org.eclipse.ocl.git/snapshot/org.eclipse.ocl-%{gittag}.tar.bz2
+
+# patch to accomodate ICU4J changing version number schemes
+Patch0:    fix-icu-version.patch
 
 BuildArch:        noarch
 
@@ -22,12 +22,14 @@ BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:4.2.0
 BuildRequires:    eclipse-emf >= 2.8.0
 BuildRequires:    eclipse-mdt-uml2 >= 4.0.0
+BuildRequires:    icu4j-eclipse
 BuildRequires:    lpg-java >= 2.0.17
 Requires:         java
 Requires:         jpackage-utils
 Requires:         eclipse-platform >= 1:4.2.0
 Requires:         eclipse-emf >= 2.8.0
 Requires:         eclipse-mdt-uml2 >= 4.0.0
+Requires:         icu4j-eclipse
 Requires:         lpg-java >= 2.0.17
 
 %description
@@ -41,7 +43,14 @@ clients to customize the parsing and evaluation environments used by the
 parser.
 
 %prep
-%setup -q -n mdt-ocl-%{version}
+%setup -q -n org.eclipse.ocl-%{gittag}
+%patch0 -p0 -b .orig
+
+# remove stuff we're not building
+rm -rf archive/ examples/ tests/
+
+# this copy works around ant not honouring symlinks
+cp -pr features/org.eclipse.ocl.license-feature features/org.eclipse.ocl.license
 
 mkdir orbitDeps
 pushd orbitDeps
@@ -51,7 +60,7 @@ popd
 %build
 # build mdt-ocl features
 eclipse-pdebuild -f org.eclipse.ocl \
-  -d "emf mdt-uml2" -o `pwd`/orbitDeps
+  -d "icu4j-eclipse emf mdt-uml2" -o `pwd`/orbitDeps
 eclipse-pdebuild -f org.eclipse.ocl.uml \
   -d "emf mdt-uml2"
 eclipse-pdebuild -f org.eclipse.ocl.edit \
@@ -77,9 +86,13 @@ popd
 
 %files
 %{eclipse_dropin}/mdt-ocl
-%doc org.eclipse.ocl.license-feature/*.html
+%doc features/org.eclipse.ocl.license-feature/*.html
 
 %changelog
+* Tue Feb 26 2013 Mat Booth <fedora at matbooth.co.uk> - 4.0.2-1
+- Update to latest upstream.
+- Fix FTBFS rhbz #913956.
+
 * 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
 
@@ -105,5 +118,5 @@ popd
 - Use build-classpath when symlinking to dependent bundles.
 - Don't pretty-print the package description.
 
-* Tue Nov 8 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-1
+* Sun Nov 8 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-1
 - New OCL spec file based on eclipse-gef.
diff --git a/fix-icu-version.patch b/fix-icu-version.patch
new file mode 100644
index 0000000..90438b3
--- /dev/null
+++ b/fix-icu-version.patch
@@ -0,0 +1,13 @@
+--- ./plugins/org.eclipse.ocl/META-INF/MANIFEST.MF.orig	2013-02-26 13:41:09.281545454 +0000
++++ ./plugins/org.eclipse.ocl/META-INF/MANIFEST.MF	2013-02-26 13:44:49.426027050 +0000
+@@ -38,8 +38,8 @@
+  org.eclipse.ocl.utilities,
+  org.eclipse.ocl.utilities.impl,
+  org.eclipse.ocl.utilities.util
+-Import-Package: com.ibm.icu.lang;version="[4.0.0,5.0.0)";resolution:=optional,
+- com.ibm.icu.text;version="[4.0.0,5.0.0)";resolution:=optional
++Import-Package: com.ibm.icu.lang;resolution:=optional,
++ com.ibm.icu.text;resolution:=optional
+ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
+  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
diff --git a/sources b/sources
index 38f7d99..fc09324 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5cd27cc02e934788c622a33e70bfa213  mdt-ocl-4.0.0.tar.gz
+8ac45a7dab74ed0ecbbf30511b71722b  org.eclipse.ocl-R4_0_2.tar.bz2