[eclipse-mdt-ocl] - Update to Helios release. - Fixes RHBZ #631406.

[mbooth]

commit d95f8ac7a2eee16a5789330e332b07f504b496cc
Author: mbooth <fedora at matbooth.co.uk>
Date:   Mon Sep 13 22:46:49 2010 +0100

    - Update to Helios release.
    - Fixes RHBZ #631406.

 .gitignore           |    1 +
 eclipse-mdt-ocl.spec |   34 +++++++++++++++++++---------------
 get-mdt-ocl.sh       |    4 ++--
 sources              |    1 +
 4 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3fd24c0..74f1dac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mdt-ocl-1.3.0.tar.gz
+mdt-ocl-3.0.0.tar.gz
diff --git a/eclipse-mdt-ocl.spec b/eclipse-mdt-ocl.spec
index 7e2269f..c6b9f6a 100644
--- a/eclipse-mdt-ocl.spec
+++ b/eclipse-mdt-ocl.spec
@@ -3,11 +3,11 @@
 
 # Note: Use the tag in get-mdt-ocl.sh as the context qualifier because it's
 #       later than the tags of the individual plugins.
-%global contextQualifier v200906151742
+%global contextQualifier v201006141954
 
 Name:      eclipse-mdt-ocl
-Version:   1.3.0
-Release:   2%{?dist}
+Version:   3.0.0
+Release:   1%{?dist}
 Summary:   Implementation of the OCL OMG metamodel for Eclipse
 Group:     System Environment/Libraries
 License:   EPL
@@ -25,16 +25,16 @@ BuildArch:        noarch
 
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.5.0
-BuildRequires:    eclipse-emf >= 2.5.0
+BuildRequires:    eclipse-pde >= 1:3.6.0
+BuildRequires:    eclipse-emf >= 2.6.0
 BuildRequires:    eclipse-mdt-uml2 >= 3.0.0
-BuildRequires:    lpg-java-compat = 1.1.0
+BuildRequires:    lpg-java >= 2.0.17
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.5.0
-Requires:         eclipse-emf >= 2.5.0
+Requires:         eclipse-platform >= 1:3.6.0
+Requires:         eclipse-emf >= 2.6.0
 Requires:         eclipse-mdt-uml2 >= 3.0.0
-Requires:         lpg-java-compat = 1.1.0
+Requires:         lpg-java >= 2.0.17
 
 %description
 OCL is an implementation of the Object Constraint Language (OCL) OMG standard
@@ -65,7 +65,7 @@ fi
 
 mkdir orbitDeps
 pushd orbitDeps
-ln -s $(build-classpath lpgjavaruntime) net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
+ln -s $(build-classpath lpgruntime) lpg.runtime.java_2.0.17.jar
 popd
 
 # remove spurious exec permissions from docs
@@ -77,7 +77,7 @@ find -wholename "*/rootfiles/*" | xargs chmod -x
   -d "emf uml2" -o `pwd`/orbitDeps -a "-DforceContextQualifier=%{contextQualifier}"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.ocl.uml \
   -d "emf uml2" -o `pwd`/orbitDeps -a "-DforceContextQualifier=%{contextQualifier}"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.ocl \
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.ocl.edit \
   -d "emf uml2" -o `pwd`/orbitDeps -a "-DforceContextQualifier=%{contextQualifier}"
 
 %install
@@ -85,13 +85,13 @@ rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-ocl build/rpmBuild/org.eclipse.ocl.zip
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-ocl build/rpmBuild/org.eclipse.ocl.uml.zip
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-ocl build/rpmBuild/org.eclipse.emf.ocl.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-ocl build/rpmBuild/org.eclipse.ocl.edit.zip
 
 # use system bundles
 pushd %{buildroot}%{eclipse_dropin}/mdt-ocl/eclipse/plugins
-rm net.sourceforge.lpg.lpgjavaruntime_*.jar
-ln -s ../../../../../../..$(build-classpath lpgjavaruntime) \
-  net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
+rm lpg.runtime.java_*.jar
+ln -s ../../../../../../..$(build-classpath lpgruntime) \
+  lpg.runtime.java_2.0.17.jar
 popd
 
 %clean
@@ -103,6 +103,10 @@ rm -rf %{buildroot}
 %doc org.eclipse.ocl-feature/rootfiles/*
 
 %changelog
+* Mon Sep 13 2010 Mat Booth <fedora at matbooth.co.uk> 3.0.0-1
+- Update to Helios release.
+- Fixes RHBZ #631406.
+
 * Sun Nov 22 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-2
 - Use build-classpath when symlinking to dependent bundles.
 - Don't pretty-print the package description.
diff --git a/get-mdt-ocl.sh b/get-mdt-ocl.sh
index 5f71ed4..5280b59 100644
--- a/get-mdt-ocl.sh
+++ b/get-mdt-ocl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="mdt-ocl"
-VERSION=1.3.0
-TAG="R200906151742"
+VERSION=3.0.0
+TAG="R201006141954"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION
diff --git a/sources b/sources
index fc7d9fa..a763932 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 25f703eae6e4b3a4858dd546760d305f  mdt-ocl-1.3.0.tar.gz
+5356b31996d347dac94cfbe95a082cdd  mdt-ocl-3.0.0.tar.gz