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

Sun Oct 21 12:05:28 UTC 2012

commit cb55c8d3ce14258b384f365f98f98b4f8f049f29
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Sun Oct 21 13:15:06 2012 +0100

    Update to latest version. Adapt to newer packaging guidelines.

 .gitignore             |    4 +-
 eclipse-emf-query.spec |   56 ++++++++++++++++++-----------------------------
 get-emf-query.sh       |    8 +++++-
 sources                |    2 +-
 4 files changed, 31 insertions(+), 39 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 5aaaeec..8021c9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-emf-query-1.3.0.tar.gz
-/emf-query-1.4.0.tar.gz
+/.project
+/emf-query-1.6.0.tar.gz
diff --git a/eclipse-emf-query.spec b/eclipse-emf-query.spec
index 941a20e..4ae0deb 100644
--- a/eclipse-emf-query.spec
+++ b/eclipse-emf-query.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-query
-Version:   1.4.0
-Release:   4%{?dist}
+Version:   1.6.0
+Release:   1%{?dist}
 Summary:   Specify and execute queries against EMF models
 Group:     System Environment/Libraries
 License:   EPL
@@ -19,20 +19,18 @@ URL:       http://www.eclipse.org/modeling/emf/?project=query
 Source0:   emf-query-%{version}.tar.gz
 Source1:   get-emf-query.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 query component facilitates the process of search and retrieval of model
@@ -40,48 +38,38 @@ elements of interest in a flexible yet controlled and structured manner.
 Provides API support for the basic EObject based Condition objects that are
 used to formulate queries for EMF models.
 
-#TODO - sdk/examples subpackages?
-
 %prep
 %setup -q -n emf-query-%{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-query features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.query \
-  -d "emf ocl" -a "-DforceContextQualifier=%{contextQualifier}"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.query.ocl \
-  -d "emf ocl" -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.emf.query \
+  -d "../../java/emf emf mdt-ocl" -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.emf.query.ocl \
+  -d "../../java/emf emf mdt-ocl" -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.emf.query.doc \
+ -a "-DforceContextQualifier=%{contextQualifier}"
 
 %install
-rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-query build/rpmBuild/org.eclipse.emf.query.zip
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-query build/rpmBuild/org.eclipse.emf.query.ocl.zip
-
-%clean
-rm -rf %{buildroot}
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-query build/rpmBuild/org.eclipse.emf.query.doc.zip
 
 %files
-%defattr(-,root,root,-)
 %{eclipse_dropin}/emf-query
 %doc org.eclipse.emf.query-feature/rootfiles/*
 
 %changelog
+* Sun Oct 21 2012 Mat Booth <fedora at matbooth.co.uk> - 1.6.0-1
+- Update to latest version.
+- Adapt to newer packaging guidelines.
+- Fix FTBFS bug 843211.
+- 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-query.sh b/get-emf-query.sh
index 49d80f3..7aac581 100644
--- a/get-emf-query.sh
+++ b/get-emf-query.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="emf-query"
-VERSION=1.4.0
-TAG="R201006151000"
+VERSION=1.6.0
+TAG="R201206271200"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION
@@ -12,6 +12,10 @@ TEMPMAPFILE=temp.map
 wget "http://download.eclipse.org/modeling/emf/query/downloads/drops/$VERSION/$TAG/directory.txt" -O $MAPFILE
 dos2unix $MAPFILE
 grep ^[a-z] $MAPFILE > $TEMPMAPFILE
+sed -i -e 's|query/plugins/org.eclipse.emf|query/org.eclipse.emf|g' $TEMPMAPFILE
+sed -i -e 's|query/doc/org.eclipse.emf|query/org.eclipse.emf|g' $TEMPMAPFILE
+sed -i -e 's|query/examples/org.eclipse.emf|query/org.eclipse.emf|g' $TEMPMAPFILE
+sed -i -e 's|query/tests/org.eclipse.emf|query/org.eclipse.emf|g' $TEMPMAPFILE
 
 gawk 'BEGIN {
 	FS=","
diff --git a/sources b/sources
index 0690911..908aec2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38fa4617b12937c1ff628bca039fa57a  emf-query-1.4.0.tar.gz
+f99ff6b38e8942e88d990cc55781539c  emf-query-1.6.0.tar.gz
