[eclipse-dtp] Update to DTP 1.9.0 (Indigo)

Wed Jul 6 20:19:28 UTC 2011

commit 751f7fe325a24df2ce8216b3fa9efbff5b0a06c1
Author: Andrew Overholt <overholt at redhat.com>
Date:   Wed Jul 6 16:16:43 2011 -0400

    Update to DTP 1.9.0 (Indigo)

 .gitignore                                |    1 +
 eclipse-dtp-remove-duplicate-plugin.patch |   16 +++++++++-------
 eclipse-dtp.spec                          |   19 +++++++++++--------
 get-dtp.sh                                |    6 +++---
 sources                                   |    2 +-
 5 files changed, 25 insertions(+), 19 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e90225f..210ccf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 dtp-*.tar.gz
 /dtp-1.8.1.tar.gz
 dtp-1.8.2.tar.gz
+dtp-1.9.0.tar.bz2
diff --git a/eclipse-dtp-remove-duplicate-plugin.patch b/eclipse-dtp-remove-duplicate-plugin.patch
index b0df190..5bc9314 100644
--- a/eclipse-dtp-remove-duplicate-plugin.patch
+++ b/eclipse-dtp-remove-duplicate-plugin.patch
@@ -1,5 +1,5 @@
---- org.eclipse.datatools.sqldevtools.feature/feature.xml	2009-04-24 10:39:24.000000000 +0100
-+++ org.eclipse.datatools.sqldevtools.feature/feature.xml	2009-07-05 21:56:31.156615551 +0100
+--- org.eclipse.datatools.sqldevtools.feature/feature.xml	2011-07-06 15:37:20.058473642 -0400
++++ org.eclipse.datatools.sqldevtools.feature/feature.xml	2011-07-06 15:37:40.718753117 -0400
 @@ -118,13 +118,6 @@
           unpack="false"/>
  
@@ -14,9 +14,9 @@
           id="org.eclipse.datatools.sqltools.db.generic"
           download-size="0"
           install-size="0"
---- org.eclipse.datatools.sqldevtools.results.feature/feature.xml	2008-11-14 06:30:00.000000000 +0000
-+++ org.eclipse.datatools.sqldevtools.results.feature/feature.xml	2009-07-06 22:42:45.189007201 +0100
-@@ -39,11 +39,4 @@
+--- org.eclipse.datatools.sqldevtools.results.feature/feature.xml	2011-07-06 15:37:24.745537051 -0400
++++ org.eclipse.datatools.sqldevtools.results.feature/feature.xml	2011-07-06 15:37:47.999851584 -0400
+@@ -39,13 +39,6 @@
           version="0.0.0"
           unpack="false"/>
  
@@ -26,5 +26,7 @@
 -         install-size="0"
 -         version="0.0.0"
 -         unpack="false"/>
--
- </feature>
+-         
+     <plugin
+          id="org.apache.lucene"
+          download-size="0"
diff --git a/eclipse-dtp.spec b/eclipse-dtp.spec
index 3696a69..94dffb2 100644
--- a/eclipse-dtp.spec
+++ b/eclipse-dtp.spec
@@ -2,7 +2,7 @@
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-dtp
-Version:   1.8.2
+Version:   1.9.0
 Release:   1%{?dist}
 Summary:   Eclipse Data Tools Platform
 Group:     System Environment/Libraries
@@ -12,7 +12,7 @@ URL:       http://www.eclipse.org/datatools/
 # source tarball and the script used to generate it from upstream's source control
 # script usage:
 # $ sh get-dtp.sh
-Source0:   dtp-%{version}.tar.gz
+Source0:   dtp-%{version}.tar.bz2
 Source1:   get-dtp.sh
 
 # Build with Java 6 SQL interfaces
@@ -28,9 +28,9 @@ BuildArch:        noarch
 
 BuildRequires:    java-devel 
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.4.2
-BuildRequires:    eclipse-emf
-BuildRequires:    eclipse-gef
+BuildRequires:    eclipse-pde >= 1:3.6.1
+BuildRequires:    eclipse-emf >= 2.6.0
+BuildRequires:    eclipse-gef >= 3.6.1
 BuildRequires:    wsdl4j >= 1.5.2-6.6
 BuildRequires:    xerces-j2 >= 2.7.1-10.3
 BuildRequires:    xml-commons-resolver >= 1.1-2.15
@@ -84,13 +84,13 @@ ln -s %{_javadir}/xerces-j2.jar org.apache.xerces_2.9.0.jar
 ln -s %{_javadir}/xalan-j2-serializer.jar org.apache.xml.serializer_2.7.1.jar
 ln -s %{_javadir}/xml-commons-resolver.jar org.apache.xml.resolver_1.2.0.jar
 ln -s %{_javadir}/xml-commons-apis.jar javax.xml_1.3.4.jar
-ln -s %{_javadir}/wsdl4j.jar javax.wsdl_1.5.0.jar
+ln -s %{_javadir}/wsdl4j.jar javax.wsdl_1.5.1.jar
 ln -s %{_javadir}/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 popd
 
 %build
 # Note: Use date from the cvs tag as the context qualifier.
-OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v201102060800"
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v201106031406"
 
 # build all features except for documentation and SDK features TODO: build everything
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.modelbase.feature \
@@ -121,7 +121,7 @@ ln -s ../../../../../java/xml-commons-resolver.jar org.apache.xml.resolver_1.2.0
 rm javax.xml_*.jar
 ln -s ../../../../../java/xml-commons-apis.jar javax.xml_1.3.4.jar
 rm javax.wsdl_*.jar
-ln -s ../../../../../java/wsdl4j.jar javax.wsdl_1.5.0.jar
+ln -s ../../../../../java/wsdl4j.jar javax.wsdl_1.5.1.jar
 popd
 pushd %{buildroot}%{eclipse_dropin}/dtp-sqldevtools/eclipse/plugins
 rm net.sourceforge.lpg.lpgjavaruntime_*.jar
@@ -140,6 +140,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.datatools.sdk-all.feature/rootfiles/*
 
 %changelog
+* Wed Jul 6 2011 Andrew Overholt <overholt at redhat.com> 1.9.0-1
+- Update to 1.9.0.
+
 * Fri Mar 18 2011 Mat Booth <fedora at matbooth.co.uk> 1.8.2-1
 - Update to 1.8.2.
 
diff --git a/get-dtp.sh b/get-dtp.sh
index 12293fb..82c637c 100644
--- a/get-dtp.sh
+++ b/get-dtp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="dtp"
-VERSION=1.8.2
-TAG="DTP_1_8_2_Release_201102060800"
+VERSION=1.9.0
+TAG="DTP_1_9_0_Release_201106031406"
 MAPFILES='
 org.eclipse.datatools.releng/maps/dtp-features.map
 org.eclipse.datatools.modelbase/releng/org.eclipse.datatools.modelbase.releng/maps/modelbase-plugins.map
@@ -55,4 +55,4 @@ done
 popd >/dev/null
 
 echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
-tar -czf $NAME-$VERSION.tar.gz $NAME-$VERSION
+tar -cjf $NAME-$VERSION.tar.bz2 $NAME-$VERSION
diff --git a/sources b/sources
index 4ae9c63..09e9e99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50e51ef38a7337c86173c8fa680391dd  dtp-1.8.2.tar.gz
+a3d88fc5e207acbd2a974046cfc45645  dtp-1.9.0.tar.bz2
