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

[mbooth]

commit 357544f7c1bafd44bc0b9be0281343c432631662
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Sun Oct 21 14:17:40 2012 +0100

    Update to latest version. Adapt to newer packaging guidelines.

 .gitignore                   |    4 +-
 eclipse-emf-transaction.spec |   63 ++++++++++++++++++------------------------
 get-emf-transaction.sh       |    4 +-
 sources                      |    2 +-
 4 files changed, 32 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ed0ece1..2480235 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-emf-transaction-1.3.1.tar.gz
-/emf-transaction-1.4.0.tar.gz
+/.project
+/emf-transaction-1.6.0.tar.gz
diff --git a/eclipse-emf-transaction.spec b/eclipse-emf-transaction.spec
index 70a9f85..68ae40f 100644
--- a/eclipse-emf-transaction.spec
+++ b/eclipse-emf-transaction.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-transaction
-Version:   1.4.0
-Release:   4%{?dist}
+Version:   1.6.0
+Release:   1%{?dist}
 Summary:   A model management layer for managing EMF resources
 Group:     System Environment/Libraries
 License:   EPL
@@ -19,22 +19,20 @@ URL:       http://www.eclipse.org/modeling/emf/?project=transaction
 Source0:   emf-transaction-%{version}.tar.gz
 Source1:   get-emf-transaction.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-emf-query >= 1.4.0
-BuildRequires:    eclipse-emf-validation >= 1.4.0
+BuildRequires:    eclipse-pde >= 1:4.2.0
+BuildRequires:    eclipse-emf >= 2.8.0
+BuildRequires:    eclipse-emf-query >= 1.6.0
+BuildRequires:    eclipse-emf-validation >= 1.6.0
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.6.0
-Requires:         eclipse-emf >= 2.6.0
-Requires:         eclipse-emf-query >= 1.4.0
-Requires:         eclipse-emf-validation >= 1.4.0
+Requires:         eclipse-platform >= 1:4.2.0
+Requires:         eclipse-emf >= 2.8.0
+Requires:         eclipse-emf-query >= 1.6.0
+Requires:         eclipse-emf-validation >= 1.6.0
 
 %description
 The transaction component provide support for clients to read and write EMF
@@ -46,48 +44,41 @@ programming model, the API automatically tracks changes applied to models
 without the need for client code to use EMF edit commands. These changes are
 encapsulated in transactions/operations that can undo and redo themselves.
 
-#TODO - sdk/examples subpackages?
-
 %prep
 %setup -q -n emf-transaction-%{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-transaction features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.transaction \
-  -d "emf" -a "-DforceContextQualifier=%{contextQualifier}"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.workspace \
-  -d "emf" -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.emf.transaction \
+  -d "../../java/emf emf emf-validation emf-validation" -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.emf.workspace \
+  -d "../../java/emf emf emf-validation emf-validation" -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.emf.transaction.doc \
+  -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.emf.workspace.doc \
+  -a "-DforceContextQualifier=%{contextQualifier}"
 
 %install
-rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-transaction build/rpmBuild/org.eclipse.emf.transaction.zip
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-transaction build/rpmBuild/org.eclipse.emf.workspace.zip
-
-%clean
-rm -rf %{buildroot}
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-transaction build/rpmBuild/org.eclipse.emf.transaction.doc.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-transaction build/rpmBuild/org.eclipse.emf.workspace.doc.zip
 
 %files
-%defattr(-,root,root,-)
 %{eclipse_dropin}/emf-transaction
 %doc org.eclipse.emf.transaction-feature/rootfiles/*
 
 %changelog
+* Mon Oct 15 2012 Mat Booth <fedora at matbooth.co.uk> - 1.6.0-1
+- Update to latest version.
+- Adapt to newer packaging guidelines.
+- Fix FTBFS bug 843212.
+- 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-transaction.sh b/get-emf-transaction.sh
index bee4508..ca39726 100644
--- a/get-emf-transaction.sh
+++ b/get-emf-transaction.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="emf-transaction"
-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 cd4d5bf..03b899f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-45d40af74ee153ca78b65e6b478f40ae  emf-transaction-1.4.0.tar.gz
+a9c82851913eb1176d06809d6ef7facb  emf-transaction-1.6.0.tar.gz