[eclipse-dtp] Update to 1.10 M6
Andrew Overholt
overholt at fedoraproject.org
Mon Apr 9 19:13:33 UTC 2012
commit a1eda4796357dddf699e7d89918b61a640856661
Author: Andrew Overholt <overholt at redhat.com>
Date: Mon Apr 9 13:38:26 2012 -0400
Update to 1.10 M6
Clean up source files. Use new eclipse-pdebuild. Update fetching
script.
.gitignore | 4 +++
eclipse-dtp.spec | 65 +++++++++++++++++++----------------------------------
get-dtp.sh | 12 ++-------
sources | 22 +++---------------
4 files changed, 34 insertions(+), 69 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5107c01..f805747 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,7 @@ org.eclipse.datatools.enablement.general-DTP_1_9_1_Release_201109031845.tar.bz2
/org.eclipse.datatools.sqltools-DTP_1_9_1_Release_201109031845.tar.bz2
/eclipse-dtp-1.9.1
/noarch
+/org.eclipse.datatools.connectivity-DTP_1_10_0_M6_201203160500.tar.bz2
+/org.eclipse.datatools.sqltools-DTP_1_10_0_M6_201203160500.tar.bz2
+/org.eclipse.datatools.enablement.general-DTP_1_10_0_M6_201203160500.tar.bz2
+/org.eclipse.datatools.build-DTP_1_10_0_M6_201203160500.tar.bz2
diff --git a/eclipse-dtp.spec b/eclipse-dtp.spec
index 7d5e0b4..3619a5f 100644
--- a/eclipse-dtp.spec
+++ b/eclipse-dtp.spec
@@ -1,7 +1,7 @@
%global eclipse_base %{_libdir}/eclipse
%global eclipse_dropin %{_datadir}/eclipse/dropins
-%global tag DTP_1_9_1_Release_201109031845
+%global tag DTP_1_10_0_M6_201203160500
# Match the context qualifier with the upstream p2 repo
#
# eclipse -consolelog -nosplash -application org.eclipse.equinox.p2.director \
@@ -10,36 +10,27 @@
# sed "s/org.eclipse.datatools.sdk.feature.feature.group=//" | \
# sed "s/%%{version}.//" | \
# sed "s/-.*//"
-%global qualifier v201108301820
+
+# For 1.10 M6, use this zip
+# http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/drops/N_DTP_1.10/dtp-p2repo-1.10.0M6-201203160500.zip
+# and get the IU list as above
+%global qualifier v201201161512
Name: eclipse-dtp
-Version: 1.9.1
-Release: 4%{?dist}
+Version: 1.10
+Release: 0.1.M6%{?dist}
Summary: Eclipse Data Tools Platform
Group: System Environment/Libraries
License: EPL
URL: http://www.eclipse.org/datatools/
# get-dtp.sh will download all these tarballs
-Source0: http://git.eclipse.org/c/datatools/org.eclipse.datatools.build.git/snapshot/org.eclipse.datatools.build-%{tag}.tar.bz2
-Source1: http://git.eclipse.org/c/datatools/org.eclipse.datatools.connectivity.git/snapshot/org.eclipse.datatools.connectivity-%{tag}.tar.bz2
-Source2: http://git.eclipse.org/c/datatools/org.eclipse.datatools.doc.git/snapshot/org.eclipse.datatools.doc-%{tag}.tar.bz2
+Source0: http://git.eclipse.org/c/datatools/org.eclipse.datatools.connectivity.git/snapshot/org.eclipse.datatools.connectivity-%{tag}.tar.bz2
+Source1: http://git.eclipse.org/c/datatools/org.eclipse.datatools.modelbase.git/snapshot/org.eclipse.datatools.modelbase-%{tag}.tar.bz2
+Source2: http://git.eclipse.org/c/datatools/org.eclipse.datatools.sqltools.git/snapshot/org.eclipse.datatools.sqltools-%{tag}.tar.bz2
Source3: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.general.git/snapshot/org.eclipse.datatools.enablement.general-%{tag}.tar.bz2
-Source4: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.hsqldb.git/snapshot/org.eclipse.datatools.enablement.hsqldb-%{tag}.tar.bz2
-Source5: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.ibm.git/snapshot/org.eclipse.datatools.enablement.ibm-%{tag}.tar.bz2
-Source6: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.ingres.git/snapshot/org.eclipse.datatools.enablement.ingres-%{tag}.tar.bz2
-Source7: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.msft.git/snapshot/org.eclipse.datatools.enablement.msft-%{tag}.tar.bz2
-Source8: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.mysql.git/snapshot/org.eclipse.datatools.enablement.mysql-%{tag}.tar.bz2
-Source9: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.oda.git/snapshot/org.eclipse.datatools.enablement.oda-%{tag}.tar.bz2
-Source10: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.oracle.git/snapshot/org.eclipse.datatools.enablement.oracle-%{tag}.tar.bz2
-Source11: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.postgresql.git/snapshot/org.eclipse.datatools.enablement.postgresql-%{tag}.tar.bz2
-Source12: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.sap.git/snapshot/org.eclipse.datatools.enablement.sap-%{tag}.tar.bz2
-Source13: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.sqlite.git/snapshot/org.eclipse.datatools.enablement.sqlite-%{tag}.tar.bz2
-Source14: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.sybase.git/snapshot/org.eclipse.datatools.enablement.sybase-%{tag}.tar.bz2
-Source15: http://git.eclipse.org/c/datatools/org.eclipse.datatools.incubator.git/snapshot/org.eclipse.datatools.incubator-%{tag}.tar.bz2
-Source16: http://git.eclipse.org/c/datatools/org.eclipse.datatools.modelbase.git/snapshot/org.eclipse.datatools.modelbase-%{tag}.tar.bz2
-Source17: http://git.eclipse.org/c/datatools/org.eclipse.datatools.sqltools.git/snapshot/org.eclipse.datatools.sqltools-%{tag}.tar.bz2
-Source18: get-dtp.sh
+Source4: http://git.eclipse.org/c/datatools/org.eclipse.datatools.build.git/snapshot/org.eclipse.datatools.build-%{tag}.tar.bz2
+Source5: get-dtp.sh
# Build with Java 7 SQL interfaces
Patch0: %{name}-java7.patch
@@ -60,12 +51,9 @@ ExclusiveArch: %{ix86} x86_64
BuildArch: noarch
%endif
-# FIXME:
-# This should be java-devle >= 1:1.7.0 but at the moment OpenJDK's 1.7 RPMs
-# don't Provide that
-BuildRequires: java-1.7.0-openjdk-devel
+BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils
-BuildRequires: eclipse-pde >= 1:3.6.1
+BuildRequires: eclipse-pde >= 1:4.2.0-0.4
BuildRequires: eclipse-emf >= 2.6.0
BuildRequires: eclipse-gef >= 3.6.1
BuildRequires: wsdl4j >= 1.5.2-6.6
@@ -75,10 +63,7 @@ BuildRequires: xalan-j2 >= 2.7.0-7.5
BuildRequires: xml-commons-apis >= 1.3.04-1.4
BuildRequires: lpg-java-compat = 1.1.0
-# FIXME:
-# This should be java >= 1:1.7.0 but at the moment OpenJDK's 1.7 RPMs don't
-# Provide that
-Requires: java-1.7.0-openjdk
+Requires: java >= 1:1.7.0
Requires: jpackage-utils
Requires: eclipse-platform >= 1:3.4.2
Requires: eclipse-emf
@@ -96,7 +81,7 @@ tools, enabling a diverse set of plug-in offerings specific to particular
data-centric technologies and supported by the DTP ecosystem.
%prep
-%setup -q -c dtp-%{version} -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17
+%setup -q -c dtp-%{version} -a 1 -a 2 -a 3 -a 4
# apply patches
pushd org.eclipse.datatools.connectivity-%{tag}/plugins/org.eclipse.datatools.connectivity.sqm.core
@@ -118,10 +103,6 @@ sed -i -e "s|2.9.0.qualifier|0.0.0|g" \
org.eclipse.datatools.enablement.oda.feature/feature.xml
popd
-pushd org.eclipse.datatools.doc-%{tag}/packaged_jars
-rm -rf *.jar
-popd
-
# make sure upstream hasn't snuck in any jars we don't know about
JARS=""
for j in `find -name "*.jar"`; do
@@ -149,13 +130,13 @@ popd
OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=%{qualifier}"
# build all features except for documentation and SDK features TODO: build everything
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.modelbase.feature \
+eclipse-pdebuild -f org.eclipse.datatools.modelbase.feature \
-d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.connectivity.feature \
+eclipse-pdebuild -f org.eclipse.datatools.connectivity.feature \
-d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.sqldevtools.feature \
+eclipse-pdebuild -f org.eclipse.datatools.sqldevtools.feature \
-d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.enablement.feature \
+eclipse-pdebuild -f org.eclipse.datatools.enablement.feature \
-d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
%install
@@ -196,8 +177,8 @@ rm -rf %{buildroot}
%doc org.eclipse.datatools.build-%{tag}/features/org.eclipse.datatools.sdk-all.feature/rootfiles/*
%changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Mon Apr 9 2012 Andrew Overholt <overholt at redhat.com> 1.10-0.1.M6
+- Update to 1.10 M6.
* Fri Dec 2 2011 Andrew Overholt <overholt at redhat.com> 1.9.1-3
- Fix ExclusiveArch/noarch.
diff --git a/get-dtp.sh b/get-dtp.sh
index 4db27d6..4c480b6 100644
--- a/get-dtp.sh
+++ b/get-dtp.sh
@@ -1,19 +1,13 @@
#!/bin/bash
NAME="dtp"
VERSION=1.9.1
-TAG="DTP_1_9_1_Release_201109031845"
-MAPFILE='http://download.eclipse.org/datatools/downloads/1.9/directory_1.9.1.txt'
+TAG="DTP_1_10_0_M6_201203160500"
echo "Grabbing git tag tarballs..."
-#wget $MAPFILE
-#projects=`grep "\.git," $MAPFILE | \
-#sed "s/.*git:\/\/git.eclipse.org\/gitroot\/datatools\///" | \
-#sed "s/.git,path=.*//" | sort | uniq`
-
# for now, just fetch those projects we build
-projects="org.eclipse.datatools.modelbase org.eclipse.datatools.connectivity org.eclipse.datatools.sqldevtools org.eclipse.datatools.enablement"
+projects="org.eclipse.datatools.modelbase org.eclipse.datatools.connectivity org.eclipse.datatools.sqltools org.eclipse.datatools.enablement org.eclipse.datatools.build"
for project in $projects; do
wget http://git.eclipse.org/c/datatools/$project.git/snapshot/$project-$TAG.tar.bz2
-done
\ No newline at end of file
+done
diff --git a/sources b/sources
index 4cc880a..98d8f16 100644
--- a/sources
+++ b/sources
@@ -1,18 +1,4 @@
-ccbd8fcb1d3b5788a116f7d2575c5f16 org.eclipse.datatools.build-DTP_1_9_1_Release_201109031845.tar.bz2
-52692882213bf627922d626ae75c8112 org.eclipse.datatools.enablement.hsqldb-DTP_1_9_1_Release_201109031845.tar.bz2
-ebff4b10768b082687b6e85ced12ed96 org.eclipse.datatools.enablement.general-DTP_1_9_1_Release_201109031845.tar.bz2
-1d17d2fc9cbec20759cbb606a10674e2 org.eclipse.datatools.connectivity-DTP_1_9_1_Release_201109031845.tar.bz2
-55de1b11c3a94e9b321601983ec8e139 org.eclipse.datatools.doc-DTP_1_9_1_Release_201109031845.tar.bz2
-cf1ece176c12b1bb01b24bddaaa38be5 org.eclipse.datatools.enablement.ibm-DTP_1_9_1_Release_201109031845.tar.bz2
-fa27adf3ca77dcecd8e5322bf4d82e6a org.eclipse.datatools.enablement.ingres-DTP_1_9_1_Release_201109031845.tar.bz2
-e35ddea0dd618f2e60875fefaa20070e org.eclipse.datatools.enablement.msft-DTP_1_9_1_Release_201109031845.tar.bz2
-10bab5eb73a51e09447e8115e6f1d385 org.eclipse.datatools.enablement.mysql-DTP_1_9_1_Release_201109031845.tar.bz2
-3bc6d9becd7bc30aa8d5c6c6cf6b65f5 org.eclipse.datatools.enablement.oda-DTP_1_9_1_Release_201109031845.tar.bz2
-023b1fd44ea7d61eaa4941d6eb9b6a7c org.eclipse.datatools.enablement.oracle-DTP_1_9_1_Release_201109031845.tar.bz2
-c7674396f609677c2e5971692e6ae2ec org.eclipse.datatools.enablement.postgresql-DTP_1_9_1_Release_201109031845.tar.bz2
-3232748194a3c693b0636a51da660916 org.eclipse.datatools.enablement.sap-DTP_1_9_1_Release_201109031845.tar.bz2
-413c0f5649214d011d593b5578ce8f77 org.eclipse.datatools.enablement.sqlite-DTP_1_9_1_Release_201109031845.tar.bz2
-d4981afacd1dad050c58d21695ea9e50 org.eclipse.datatools.enablement.sybase-DTP_1_9_1_Release_201109031845.tar.bz2
-5b9777334a5a36122c74c1c59a0e9c34 org.eclipse.datatools.incubator-DTP_1_9_1_Release_201109031845.tar.bz2
-7ca853a1c442ee0d4538269651e89aad org.eclipse.datatools.modelbase-DTP_1_9_1_Release_201109031845.tar.bz2
-3cb8346e81355dca51be31b3b14f2421 org.eclipse.datatools.sqltools-DTP_1_9_1_Release_201109031845.tar.bz2
+126594361b7626bb2045bc9efca905f0 org.eclipse.datatools.connectivity-DTP_1_10_0_M6_201203160500.tar.bz2
+31a6a02f5778730333b7c9e5a4d7587d org.eclipse.datatools.sqltools-DTP_1_10_0_M6_201203160500.tar.bz2
+8056e6dd61a5ae1e941c4dfd5ac6e40c org.eclipse.datatools.enablement.general-DTP_1_10_0_M6_201203160500.tar.bz2
+42dbcb684369a95a0e89aa6461f04981 org.eclipse.datatools.build-DTP_1_10_0_M6_201203160500.tar.bz2
More information about the scm-commits
mailing list