[eclipse-emf-validation/f18] Update to latest version. Adapt to newer packaging guidelines.

[mbooth]

commit 74eb15b45948226a6a419d9f0dd891bc9e60f724
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Sat Oct 20 21:48:01 2012 +0100

    Update to latest version. Adapt to newer packaging guidelines.

 .gitignore                  |    4 +-
 eclipse-emf-validation.spec |   56 +++++++++++++++++--------------------------
 get-emf-validation.sh       |    4 +-
 sources                     |    2 +-
 4 files changed, 27 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b413d94..99bb5c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-emf-validation-1.3.1.tar.gz
-/emf-validation-1.4.0.tar.gz
+/.project
+/emf-validation-1.6.0.tar.gz
diff --git a/eclipse-emf-validation.spec b/eclipse-emf-validation.spec
index c54f795..1ba2cf7 100644
--- a/eclipse-emf-validation.spec
+++ b/eclipse-emf-validation.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 v201006151000
+%global contextQualifier R201206271200
 
 Name:      eclipse-emf-validation
-Version:   1.4.0
-Release:   4%{?dist}
+Version:   1.6.0
+Release:   1%{?dist}
 Summary:   Verify the integrity of EMF models
 Group:     System Environment/Libraries
 License:   EPL
@@ -19,20 +19,18 @@ URL:       http://www.eclipse.org/modeling/emf/?project=validation
 Source0:   emf-validation-%{version}.tar.gz
 Source1:   get-emf-validation.sh
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:        noarch
 
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.6.0
-BuildRequires:    eclipse-emf >= 2.6.0
-BuildRequires:    eclipse-mdt-ocl >= 3.0.0
+BuildRequires:    eclipse-pde >= 1:4.2.0
+BuildRequires:    eclipse-emf >= 2.8.0
+BuildRequires:    eclipse-mdt-ocl >= 4.0.0
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.6.0
-Requires:         eclipse-emf >= 2.6.0
-Requires:         eclipse-mdt-ocl >= 3.0.0
+Requires:         eclipse-platform >= 1:4.2.0
+Requires:         eclipse-emf >= 2.8.0
+Requires:         eclipse-mdt-ocl >= 4.0.0
 
 %description
 The validation component provides an API for defining constraints for any EMF
@@ -45,48 +43,38 @@ contexts" that describe the objects that need to be validated and to bind them
 to constraints that need to be enforced on these objects and provides support
 for listening to validation events.
 
-#TODO - sdk/examples subpackages?
-
 %prep
 %setup -q -n emf-validation-%{version}
 
-# make sure upstream hasn't sneaked in any jars we don't know about
-JARS=""
-for j in `find -name "*.jar"`; do
-  if [ ! -L $j ]; then
-    JARS="$JARS $j"
-  fi
-done
-if [ ! -z "$JARS" ]; then
-   echo "These jars should be deleted and symlinked to system jars: $JARS"
-   exit 1
-fi
-
 # remove spurious exec permissions from docs
 find -wholename "*/rootfiles/*" | xargs chmod -x
 
 %build
 # build emf-validation features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.validation \
-  -d "emf ocl" -a "-DforceContextQualifier=%{contextQualifier}"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.validation.ocl \
-  -d "emf ocl" -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.emf.validation \
+  -d "../../java/emf emf mdt-ocl" -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.emf.validation.ocl \
+  -d "../../java/emf emf mdt-ocl /usr/share/java/emf" -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.emf.validation.doc \
+  -a "-DforceContextQualifier=%{contextQualifier}"
 
 %install
-rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-validation build/rpmBuild/org.eclipse.emf.validation.zip
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-validation build/rpmBuild/org.eclipse.emf.validation.ocl.zip
-
-%clean
-rm -rf %{buildroot}
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-validation build/rpmBuild/org.eclipse.emf.validation.doc.zip
 
 %files
-%defattr(-,root,root,-)
 %{eclipse_dropin}/emf-validation
 %doc org.eclipse.emf.validation-feature/rootfiles/*
 
 %changelog
+* Sat Oct 20 2012 Mat Booth <fedora at matbooth.co.uk> - 1.6.0-1
+- Update to latest version.
+- Adapt to newer packaging guidelines.
+- Fix FTBFS bug 843213.
+- Include emf from new location during pdebuild.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/get-emf-validation.sh b/get-emf-validation.sh
index 2f63d8b..a757230 100644
--- a/get-emf-validation.sh
+++ b/get-emf-validation.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="emf-validation"
-VERSION=1.4.0
-TAG="R201006151000"
+VERSION=1.6.0
+TAG="R201206271200"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION
diff --git a/sources b/sources
index 980e798..78f08d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78679eb14e66468570cd285b2822e5fb  emf-validation-1.4.0.tar.gz
+ea7fd3245e85e65d5c6c93db34d56a90  emf-validation-1.6.0.tar.gz