rpms/eclipse-dtp/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 eclipse-dtp.spec, 1.6, 1.7 get-dtp.sh, 1.3, 1.4
mbooth
mbooth at fedoraproject.org
Thu Jul 2 20:01:10 UTC 2009
Author: mbooth
Update of /cvs/pkgs/rpms/eclipse-dtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8745/eclipse-dtp/devel
Modified Files:
.cvsignore sources eclipse-dtp.spec get-dtp.sh
Log Message:
* Thu Jul 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.7.0-1
- Update to 1.7.0 final release (Galileo).
- Get map files from CVS instead of maintaining our own.
- Require Eclipse 3.4.2.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 27 May 2009 06:28:06 -0000 1.4
+++ .cvsignore 2 Jul 2009 20:00:40 -0000 1.5
@@ -1,3 +1 @@
-dtp-1.6.1.tar.gz
-dtp-1.6.2.tar.gz
dtp-1.7.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 27 May 2009 06:26:34 -0000 1.4
+++ sources 2 Jul 2009 20:00:40 -0000 1.5
@@ -1 +1 @@
-c44698f78debcb2b2413c2ffcc1b41e8 dtp-1.7.0.tar.gz
+987f947ea316163930307013ca62ba0c dtp-1.7.0.tar.gz
Index: eclipse-dtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/eclipse-dtp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- eclipse-dtp.spec 27 May 2009 06:26:34 -0000 1.6
+++ eclipse-dtp.spec 2 Jul 2009 20:00:40 -0000 1.7
@@ -3,7 +3,7 @@
Name: eclipse-dtp
Version: 1.7.0
-Release: 0.1.RC2%{?dist}
+Release: 1%{?dist}
Summary: Eclipse Data Tools Platform
Group: System Environment/Libraries
License: EPL
@@ -14,8 +14,7 @@ URL: http://www.eclipse.org/datato
# $ sh get-dtp.sh
Source0: dtp-%{version}.tar.gz
Source1: get-dtp.sh
-# List of cvs location to fetch sources.
-Source2: directory.txt
+
Patch0: %{name}-java6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,7 +23,7 @@ BuildArch: noarch
BuildRequires: java-devel
BuildRequires: jpackage-utils
-BuildRequires: eclipse-pde >= 1:3.4.1
+BuildRequires: eclipse-pde >= 1:3.4.2
BuildRequires: eclipse-emf
BuildRequires: eclipse-gef
BuildRequires: wsdl4j >= 1.5.2-5.5
@@ -35,7 +34,7 @@ BuildRequires: xml-commons-apis >= 1.
Requires: java
Requires: jpackage-utils
-Requires: eclipse-platform >= 1:3.4.1
+Requires: eclipse-platform >= 1:3.4.2
Requires: eclipse-emf
Requires: eclipse-gef
Requires: wsdl4j >= 1.5.2-5.5
@@ -56,6 +55,7 @@ data-centric technologies and supported
# remove unneeded import on sun.misc.Compare which broke compilation on non-Sun jvm
sed -i 's/import sun\.misc\.Compare;/ /' \
org.eclipse.datatools.connectivity/src/org/eclipse/datatools/connectivity/drivers/models/OverrideTemplateDescriptor.java
+
# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
for j in `find -name "*.jar"`; do
@@ -86,7 +86,6 @@ popd
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.enablement.oda.feature \
-d "emf gef" -o `pwd`/orbitDeps
-
%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_dropin}
@@ -119,6 +118,11 @@ rm -rf %{buildroot}
%doc org.eclipse.datatools.enablement.oda.feature/license.html
%changelog
+* Thu Jul 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.7.0-1
+- Update to 1.7.0 final release (Galileo).
+- Get map files from CVS instead of maintaining our own.
+- Require Eclipse 3.4.2.
+
* Wed May 27 2009 Alexander Kurtakov <akurtako at redhat.com> 1.7.0-0.1.RC2
- Update to 1.7.0 RC2.
- Use %%global.
Index: get-dtp.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/get-dtp.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- get-dtp.sh 27 May 2009 06:26:34 -0000 1.3
+++ get-dtp.sh 2 Jul 2009 20:00:40 -0000 1.4
@@ -1,14 +1,23 @@
#!/bin/bash
NAME="dtp"
VERSION=1.7.0
+TAG="DTP_1_7_0_Release_200906111239"
+MAPFILES='
+org.eclipse.datatools.releng/maps/dtp-features.map
+org.eclipse.datatools.modelbase/releng/org.eclipse.datatools.modelbase.releng/maps/modelbase-plugins.map
+org.eclipse.datatools.connectivity/releng/org.eclipse.datatools.connectivity.releng/maps/connectivity-plugins.map
+org.eclipse.datatools.sqltools/releng/org.eclipse.datatools.sqltools.releng/maps/sqldevtools-plugins.map
+org.eclipse.datatools.enablement/releng/org.eclipse.datatools.enablement.releng/maps/enablement-plugins.map'
echo "Exporting from CVS..."
-rm -fr $NAME-$VERSION
mkdir $NAME-$VERSION
pushd $NAME-$VERSION >/dev/null
-MAPFILE=../directory.txt
+for MAPFILE in $MAPFILES; do
+
TEMPMAPFILE=temp.map
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/datatools export -r $TAG $MAPFILE
+dos2unix $MAPFILE
grep ^[a-z] $MAPFILE > $TEMPMAPFILE
gawk 'BEGIN {
@@ -20,23 +29,22 @@ if (NF < 4) {
split($1, version, "=");
split(version[1], directory, "@");
cvsdir=split($2, dirName, ":");
- printf("%s %s %s%s %s %s %s %s %s %s %s\n", "cvs", "-d", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
+ printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
}
else {
split($1, version, "=");
total=split($4, directory, "/");
cvsdir=split($2, dirName, ":");
- #printf("%s\n", total);
- #printf("%s\n", version[2]);
- #printf("%s\n", directory[total]);
- #printf("%s\n", $4);
- printf("%s%s %s %s %s %s %s\n ", "cvs -d :pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
+ printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
}
}' $TEMPMAPFILE
-rm $TEMPMAPFILE
+rm $TEMPMAPFILE $MAPFILE
+
+done
+
popd >/dev/null
echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
More information about the fedora-extras-commits
mailing list