From 5d4e7642c66f3203def85779447289b9eeadc8f5 Mon Sep 17 00:00:00 2001
From: Ben Konrath <bkonrath@fedoraproject.org>
Date: Jun 29 2007 19:14:45 +0000
Subject: - 3.3.


---

diff --git a/eclipse-add-ppc64-sparc64-s390-s390x.patch b/eclipse-add-ppc64-sparc64-s390-s390x.patch
index b2dd657..eec19aa 100644
--- a/eclipse-add-ppc64-sparc64-s390-s390x.patch
+++ b/eclipse-add-ppc64-sparc64-s390-s390x.patch
@@ -120,20 +120,20 @@ diff -ru features/org.eclipse.platform.source/feature.xml features/org.eclipse.p
 --- features/org.eclipse.platform.source/feature.xml	2007-02-06 19:04:05.000000000 -0500
 +++ features/org.eclipse.platform.source/feature.xml	2007-02-06 19:07:26.000000000 -0500
 @@ -42,4 +42,6 @@
- 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.solaris.motif.sparc" version="3.3.0.v20070608-_19UEkLF-XsdF9jJrkPi"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390" version="3.3.0.v20070608-_19UEkLF-XsdF9jJrkPi"/>
- 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.3.0.v20070608-_19UEkLF-XsdF9jJrkPi"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc" version="3.3.0.v20070608-_19UEkLF-XsdF9jJrkPi"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc64" version="3.3.0.v20070608-_19UEkLF-XsdF9jJrkPi"/>
+ 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.solaris.motif.sparc" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
+ 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc64" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
  </feature>
 diff -ru features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
 --- features/org.eclipse.rcp.source/feature.xml	2007-02-06 19:04:06.000000000 -0500
 +++ features/org.eclipse.rcp.source/feature.xml	2007-02-06 19:09:11.000000000 -0500
 @@ -30,4 +30,7 @@
- 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390" version="3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu"/>
- 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ppc64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
+ 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ppc64" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc64" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
  </feature>
diff --git a/eclipse-tomcat55-build.patch b/eclipse-tomcat55-build.patch
index 7068538..b247df8 100644
--- a/eclipse-tomcat55-build.patch
+++ b/eclipse-tomcat55-build.patch
@@ -1,9 +1,9 @@
 --- build.xml.orig	2006-07-05 12:47:26.000000000 -0400
 +++ build.xml	2006-07-05 12:50:49.000000000 -0400
 @@ -144,50 +144,56 @@
- 			<pathelement path="../org.apache.ant_1.7.0.v200705232135/lib/ant-swing.jar"/>
- 			<pathelement path="../org.apache.ant_1.7.0.v200705232135/lib/ant-trax.jar"/>
- 			<pathelement path="../org.apache.ant_1.7.0.v200705232135/lib/ant-weblogic.jar"/>
+ 			<pathelement path="../org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar"/>
+ 			<pathelement path="../org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar"/>
+ 			<pathelement path="../org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar"/>
 -			<pathelement path="catalina.jar"/>
 -			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/catalina.jar"/>
 -			<pathelement path="bootstrap.jar"/>
diff --git a/eclipse.spec b/eclipse.spec
index 682f005..61f7de8 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -19,11 +19,11 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.RC4%{?dist} 
+Release:        1%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC4-200706081718/eclipse-sourceBuild-srcIncluded-3.3RC4.zip
+Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-sourceBuild-srcIncluded-3.3.zip
 Source1:        %{name}-fedora-splash-3.3.0.png
 Source2:        %{name}.desktop
 Source3:        eclipse.in
@@ -425,57 +425,57 @@ find -name \*.so | xargs rm
 # Symlinks
 
 ## BEGIN ANT ##
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-antlr.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-bcel.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-bsf.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-log4j.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-oro.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-regexp.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-resolver.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-commons-logging.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-commons-net.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jai.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-javamail.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jdepend.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jmf.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jsch.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-junit.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-launcher.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-netrexx.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-nodeps.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-starteam.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-stylebook.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-swing.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-trax.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-weblogic.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-antlr.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bcel.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bsf.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-log4j.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-oro.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-regexp.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-resolver.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-logging.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-net.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jai.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-javamail.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jdepend.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jmf.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jsch.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-junit.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-launcher.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-netrexx.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-nodeps.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-starteam.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-stylebook.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar
 # FIXME:  use build-jar-repository
-ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-antlr.jar
-ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-bcel.jar
-#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-bsf.jar
-ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-log4j.jar
-ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-oro.jar
-ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-regexp.jar
-ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-resolver.jar
-ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-commons-logging.jar
+ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-antlr.jar
+ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bcel.jar
+#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bsf.jar
+ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-log4j.jar
+ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-oro.jar
+ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-regexp.jar
+ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-resolver.jar
+ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-logging.jar
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 # the symlinks that are commented-out are not currently shipped on Fedora
-#ln -s %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-commons-net.jar
-#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jai.jar
-ln -s %{_javadir}/ant.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant.jar
-ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-javamail.jar
-ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jdepend.jar
-#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jmf.jar
-ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jsch.jar
-ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-junit.jar
-ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-launcher.jar
-#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-netrexx.jar
-ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-nodeps.jar
-#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-starteam.jar
-#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-stylebook.jar
-ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-swing.jar
-ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-trax.jar
-#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-weblogic.jar
+#ln -s %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-net.jar
+#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jai.jar
+ln -s %{_javadir}/ant.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant.jar
+ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-javamail.jar
+ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jdepend.jar
+#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jmf.jar
+ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jsch.jar
+ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-junit.jar
+ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-launcher.jar
+#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-netrexx.jar
+ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-nodeps.jar
+#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-starteam.jar
+#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-stylebook.jar
+ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar
+ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar
+#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar
 ## END ANT ##
 
 ## BEGIN TOMCAT ##
@@ -951,57 +951,57 @@ cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
 ## BEGIN ANT ##
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-antlr.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-bcel.jar
-#rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-bsf.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-log4j.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-oro.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-regexp.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-resolver.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-commons-logging.jar
-#rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-commons-net.jar
-#rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jai.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-javamail.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jdepend.jar
-#rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jmf.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jsch.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-junit.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-launcher.jar
-#rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-netrexx.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-nodeps.jar
-#rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-starteam.jar
-#rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-stylebook.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-swing.jar
-rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-trax.jar
-#rm plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-weblogic.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-antlr.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bcel.jar
+#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bsf.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-log4j.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-oro.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-regexp.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-resolver.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-logging.jar
+#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-net.jar
+#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jai.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-javamail.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jdepend.jar
+#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jmf.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jsch.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-junit.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-launcher.jar
+#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-netrexx.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-nodeps.jar
+#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-starteam.jar
+#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-stylebook.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar
+rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar
+#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar
 # FIXME:  use build-jar-repository
-ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-antlr.jar
-ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-bcel.jar
-#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-bsf.jar
-ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-log4j.jar
-ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-oro.jar
-ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-regexp.jar
-ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-apache-resolver.jar
-ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-commons-logging.jar
+ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-antlr.jar
+ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bcel.jar
+#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bsf.jar
+ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-log4j.jar
+ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-oro.jar
+ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-regexp.jar
+ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-resolver.jar
+ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-logging.jar
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 # the symlinks that are commented-out are not currently shipped on Fedora
-#ln -s %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-commons-net.jar
-#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jai.jar
-ln -s %{_javadir}/ant.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant.jar
-ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-javamail.jar
-ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jdepend.jar
-#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jmf.jar
-ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-jsch.jar
-ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-junit.jar
-ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-launcher.jar
-#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-netrexx.jar
-ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-nodeps.jar
-#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-starteam.jar
-#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-stylebook.jar
-ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-swing.jar
-ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-trax.jar
-#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant_1.7.0.v200705232135/lib/ant-weblogic.jar
+#ln -s %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-net.jar
+#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jai.jar
+ln -s %{_javadir}/ant.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant.jar
+ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-javamail.jar
+ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jdepend.jar
+#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jmf.jar
+ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jsch.jar
+ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-junit.jar
+ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-launcher.jar
+#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-netrexx.jar
+ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-nodeps.jar
+#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-starteam.jar
+#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-stylebook.jar
+ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar
+ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar
+#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar
 ## END ANT ##
 
 ## BEGIN TOMCAT ##
@@ -1596,6 +1596,9 @@ fi
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Fri Jun 29 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-1
+- 3.3.
+
 * Wed Jun 27 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-0.3.RC4
 - Restore ppc64, s390{,x} and sparc{,64} support.
 - Restore multilib support.