rpms/eclipse/devel .cvsignore, 1.28, 1.29 eclipse-tomcat55-build.patch, 1.14, 1.15 eclipse-tomcat55.patch, 1.10, 1.11 eclipse.spec, 1.431, 1.432 sources, 1.41, 1.42

Ben Konrath (bkonrath) fedora-extras-commits at redhat.com
Wed Jun 6 03:23:39 UTC 2007 

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7936

Modified Files:
	.cvsignore eclipse-tomcat55-build.patch eclipse-tomcat55.patch 
	eclipse.spec sources 
Log Message:
* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC3
- 3.3RC3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	24 May 2007 05:51:41 -0000	1.28
+++ .cvsignore	6 Jun 2007 03:22:53 -0000	1.29
@@ -3,3 +3,4 @@
 eclipse-fileinitializerapp.tar.bz2
 eclipse-sourceBuild-srcIncluded-3.3M5eh.zip
 eclipse-sourceBuild-srcIncluded-3.3RC1.zip
+eclipse-sourceBuild-srcIncluded-3.3RC3.zip

eclipse-tomcat55-build.patch:

Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- eclipse-tomcat55-build.patch	24 May 2007 05:51:41 -0000	1.14
+++ eclipse-tomcat55-build.patch	6 Jun 2007 03:22:53 -0000	1.15
@@ -1,53 +1,53 @@
 --- 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="${build.result.folder}/../org.eclipse.osgi.services/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.osgi.services_3.1.100.v20060918/@dot"/>
- 			<pathelement path="../javax.servlet_2.4.0.v200704241052.jar"/>
+ 			<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="catalina.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/catalina.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/catalina.jar"/>
 -			<pathelement path="bootstrap.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/bootstrap.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/bootstrap.jar"/>
 -			<pathelement path="commons-beanutils.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/commons-beanutils.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-beanutils.jar"/>
 -			<pathelement path="commons-collections.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/commons-collections.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-collections.jar"/>
 -			<pathelement path="commons-digester.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/commons-digester.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-digester.jar"/>
 -			<pathelement path="commons-logging-api.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/commons-logging-api.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-logging-api.jar"/>
 -			<pathelement path="commons-modeler.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/commons-modeler.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-modeler.jar"/>
 -			<pathelement path="jakarta-regexp-1.3.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/jakarta-regexp-1.3.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jakarta-regexp-1.3.jar"/>
 -			<pathelement path="jasper-compiler.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/jasper-compiler.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jasper-compiler.jar"/>
 -			<pathelement path="jasper-runtime.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/jasper-runtime.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jasper-runtime.jar"/>
 -			<pathelement path="mx4j-jmx.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/mx4j-jmx.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/mx4j-jmx.jar"/>
 -			<pathelement path="naming-common.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/naming-common.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-common.jar"/>
 -			<pathelement path="naming-factory.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/naming-factory.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-factory.jar"/>
 -			<pathelement path="naming-resources.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/naming-resources.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-resources.jar"/>
 -			<pathelement path="servlet.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/servlet.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlet.jar"/>
 -			<pathelement path="servlets-common.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/servlets-common.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-common.jar"/>
 -			<pathelement path="servlets-default.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/servlets-default.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-default.jar"/>
 -			<pathelement path="servlets-invoker.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/servlets-invoker.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-invoker.jar"/>
 -			<pathelement path="servlets-manager.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/servlets-manager.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-manager.jar"/>
 -			<pathelement path="tomcat-coyote.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/tomcat-coyote.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-coyote.jar"/>
 -			<pathelement path="tomcat-http11.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/tomcat-http11.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-http11.jar"/>
 -			<pathelement path="tomcat-util.jar"/>
--			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.130.v20070514/tomcat-util.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-util.jar"/>
 +			<pathelement path="lib/catalina.jar"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina.jar"/>
 +			<pathelement path="lib/catalina-optional.jar"/>

eclipse-tomcat55.patch:

Index: eclipse-tomcat55.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-tomcat55.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eclipse-tomcat55.patch	24 May 2007 05:51:41 -0000	1.10
+++ eclipse-tomcat55.patch	6 Jun 2007 03:22:53 -0000	1.11
@@ -736,7 +736,7 @@
  Bundle-ManifestVersion: 2
  Bundle-Name: %pluginName
  Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
- Bundle-Version: 4.1.130.qualifier
+ Bundle-Version: 4.1.230.qualifier
  Bundle-ClassPath: tomcatwrapper.jar,
 - catalina.jar,
 - bootstrap.jar,


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- eclipse.spec	24 May 2007 10:18:27 -0000	1.431
+++ eclipse.spec	6 Jun 2007 03:22:53 -0000	1.432
@@ -19,11 +19,11 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.1.RC1%{?dist} 
+Release:        0.1.RC3%{?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.3RC1-200705171700/eclipse-sourceBuild-srcIncluded-3.3RC1.zip
+Source0: 	http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC3-200706011539/eclipse-sourceBuild-srcIncluded-3.3RC3.zip
 Source2:        %{name}.desktop
 # The icu4j bits will be moved out into their own package for Fedora 7.  See:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=199504
@@ -101,7 +101,7 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
-BuildRequires: jsch >= 0:0.1.28-1jpp.6
+BuildRequires: jsch >= 0:0.1.28
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
 BuildRequires: mx4j >= 2.1
 BuildRequires: tomcat5 >= 5.5.23
@@ -182,6 +182,40 @@
 %description    rcp-sdk
 Source for Eclipse Rich Client Platform for use within Eclipse.
 
+# FIXME this is broken. 
+%package        cvs-client
+Summary:        Eclipse Rich Client Platform
+Group:          Development/Languages
+Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
+# This file-level requirement is for the bi-arch multilib case
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3320b.jar
+Requires(post):     %{libname}-gtk2 = %{epoch}:%{version}-%{release}
+Requires(postun):   %{libname}-gtk2 = %{epoch}:%{version}-%{release}
+%if %{gcj_support}
+Requires:           libgcj >= 4.0.2
+Requires(post):     java-gcj-compat >= 1.0.64
+Requires(postun):   java-gcj-compat >= 1.0.64
+%else
+Requires:       java >= 1.4.2
+%endif
+
+%description    cvs-client 
+Eclipse Rich Client Platform
+
+%package        cvs-client-sdk
+Summary:        Eclipse Rich Client Platform SDK
+Group:          Text Editors/Integrated Development Environments (IDE)
+Requires:       %{name}-rcp = %{epoch}:%{version}-%{release}
+Requires(post):    %{name}-rcp = %{epoch}:%{version}-%{release}
+Requires(postun):  %{name}-rcp = %{epoch}:%{version}-%{release}
+
+%description    cvs-client-sdk
+Source for Eclipse Rich Client Platform for use within Eclipse.
+
+
+
+
+
 %package        platform
 Summary:        Eclipse platform common files
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -205,7 +239,7 @@
 Requires: tomcat5 >= 5.5.23
 Requires: tomcat5-jasper >= 5.5.23
 Requires: tomcat5-servlet-2.4-api >= 5.5.23
-Requires: jsch >= 0:0.1.28-1jpp.6
+Requires: jsch >= 0:0.1.28
 Requires: lucene, lucene-devel
 Requires: regexp
 
@@ -401,57 +435,57 @@
 # Symlinks
 
 ## BEGIN ANT ##
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-antlr.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-bcel.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-bsf.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-log4j.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-oro.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-regexp.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-resolver.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-commons-logging.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-commons-net.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jai.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-javamail.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jdepend.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jmf.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jsch.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-junit.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-launcher.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-netrexx.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-nodeps.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-starteam.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-stylebook.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-swing.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-trax.jar
-rm plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-weblogic.jar
+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
 # FIXME:  use build-jar-repository
-ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-antlr.jar
-ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-bcel.jar
-#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-bsf.jar
-ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-log4j.jar
-ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-oro.jar
-ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-regexp.jar
-ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-resolver.jar
-ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-commons-logging.jar
+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
 # 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.v200704241635/lib/ant-commons-net.jar
-#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jai.jar
-ln -s %{_javadir}/ant.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant.jar
-ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-javamail.jar
-ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jdepend.jar
-#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jmf.jar
-ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jsch.jar
-ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-junit.jar
-ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-launcher.jar
-#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-netrexx.jar
-ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-nodeps.jar
-#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-starteam.jar
-#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-stylebook.jar
-ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-swing.jar
-ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-trax.jar
-#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-weblogic.jar
+#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
 ## END ANT ##
 
 ## BEGIN TOMCAT ##
@@ -509,7 +543,8 @@
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib servletapi5
 ## END TOMCAT ##
 
-build-jar-repository -s -p plugins/org.junit_3.8.2.v200701261102 junit
+JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
+build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
 
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 # /usr/lib -> /usr/lib64
@@ -531,31 +566,29 @@
                                                       assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
                                                       features/org.eclipse.rcp/build.xml
 
-# remove jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
-sed --in-place "s/org.eclipse.jdt.compiler.tool:0.0.0,1.0.0.v_763,//" features/org.eclipse.jdt/build.xml
-linenum=$(grep -no jdt.compiler.tool features/org.eclipse.jdt/build.xml | cut -d : -f 1)
-sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
-linenum=$(grep -no jdt.compiler.tool features/org.eclipse.jdt/feature.xml | cut -d : -f 1)
-sed --in-place -e "$(expr $linenum - 1),$(expr $linenum + 5)d" features/org.eclipse.jdt/feature.xml
-linenum=$(grep -no "dir=\"plugins/org.eclipse.jdt.compiler.tool" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
-sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
-linenum=$(grep -no "value=\"org.eclipse.jdt.compiler.tool" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
-sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
-# --
-sed --in-place "s/org.eclipse.jdt.compiler.apt:0.0.0,1.0.0.v20070510-2000,//" features/org.eclipse.jdt/build.xml
-linenum=$(grep -no jdt.compiler.apt features/org.eclipse.jdt/build.xml | cut -d : -f 1)
-sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
-linenum=$(grep -no jdt.compiler.apt features/org.eclipse.jdt/feature.xml | cut -d : -f 1)
-sed --in-place -e "$(expr $linenum - 1),$(expr $linenum + 5)d" features/org.eclipse.jdt/feature.xml
-linenum=$(grep -no "dir=\"plugins/org.eclipse.jdt.compiler.apt" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
-sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
-linenum=$(grep -no "value=\"org.eclipse.jdt.compiler.apt" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
-sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+# remove jdt.apt.pluggable.core, jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
+for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
+  version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1)
+  sed --in-place "s/org.eclipse.$plugin:0.0.0,$version,//" features/org.eclipse.jdt/build.xml
+  linenum=$(grep -no $plugin features/org.eclipse.jdt/build.xml | cut -d : -f 1)
+  sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
+  linenum=$(grep -no $plugin features/org.eclipse.jdt/feature.xml | cut -d : -f 1)
+  sed --in-place -e "$(expr $linenum - 1),$(expr $linenum + 5)d" features/org.eclipse.jdt/feature.xml
+  linenum=$(grep -no "dir=\"plugins/org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
+  sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+  linenum=$(grep -no "value=\"org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
+  sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+done
 
+# we don't have ant 1.7 right now
+sed --in-place "s|\(initialValue = request.getDefaultValue\)|// \1|" \
+  plugins/org.eclipse.ant.ui/Ant\ Runner\ Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.java
+sed --in-place "s|\(value = fRequest.getDefaultValue\)|// \1|" \
+  plugins/org.eclipse.ant.ui/Remote\ Ant\ Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/SWTInputHandler.java
 
 # link to the jsch jar
-rm plugins/com.jcraft.jsch_0.1.28.jar
-ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.28.jar
+rm plugins/com.jcraft.jsch_0.1.31.jar
+ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
 
 # set the icu4j plugins for building
 pushd plugins
@@ -604,7 +637,7 @@
 
 # Finish the icu4j build
 pushd plugins/icu4j-build/com.ibm.icu
-ant build.update.jar
+ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" build.update.jar
 mv com.ibm.icu_3.4.5.jar ../../com.ibm.icu_3.6.1.v20070417.jar
 popd
 
@@ -613,7 +646,7 @@
 # 2. Re-build ecj with output of 1.
 
 # 1a. compile ecj with javac
-ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
+ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
 
 %if %{gcj_support}
   # 1b. Natively-compile ecj
@@ -629,7 +662,7 @@
 
 # 2. Use this ecj to rebuild itself
 export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
-ant -buildfile jdtcoresrc/compilejdtcore.xml
+ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcore.xml
 
 %if %{gcj_support}
   # Natively-compile it
@@ -649,40 +682,41 @@
 ant \
   -Dnobootstrap=true \
   -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-  -Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 
+  -Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 -DcompilerArg="-encoding ISO-8859-1 -nowarn"
 
 ## Build the FileInitializer application
-#SDK=$(cd eclipse && pwd)
-#PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build | sed 's/org.eclipse.pde.build_//')
-#pushd equinox-incubator
-#mkdir -p build
-#mkdir -p home
-#homedir=$(cd home && pwd)
-#
-## This can go away when package build handles plugins (not just features)
-#echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/assemble.org.eclipse.equinox.initializer.all.xml
-#echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/package.org.eclipse.equinox.initializer.all.xml
-#
-#java -cp $SDK/startup.jar \
-#      org.eclipse.core.launcher.Main \
-#     -Duser.home=$homedir                              \
-#     -application org.eclipse.ant.core.antRunner       \
-#     -Dtype=plugin                                    \
-#     -Did=org.eclipse.equinox.initializer                   \
-#     -DsourceDirectory=$(pwd)                          \
-#     -DbaseLocation=$SDK \
-#     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-#     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-#
-#pushd build/plugins/org.eclipse.equinox.initializer
-#java -cp $SDK/startup.jar \
-#      org.eclipse.core.launcher.Main \
-#     -Duser.home=$homedir                              \
-#     -application org.eclipse.ant.core.antRunner       \
-#     -f build.xml build.update.jar
-#popd
-#
-#popd
+SDK=$(cd eclipse && pwd)
+PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build | sed 's/org.eclipse.pde.build_//')
+pushd equinox-incubator
+mkdir -p build
+mkdir -p home
+homedir=$(cd home && pwd)
+
+# This can go away when package build handles plugins (not just features)
+echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/assemble.org.eclipse.equinox.initializer.all.xml
+echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/package.org.eclipse.equinox.initializer.all.xml
+
+LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
+java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
+      org.eclipse.core.launcher.Main \
+     -Duser.home=$homedir                              \
+     -application org.eclipse.ant.core.antRunner       \
+     -Dtype=plugin                                    \
+     -Did=org.eclipse.equinox.initializer                   \
+     -DsourceDirectory=$(pwd)                          \
+     -DbaseLocation=$SDK \
+     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
+     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
+
+pushd build/plugins/org.eclipse.equinox.initializer
+java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
+      org.eclipse.core.launcher.Main \
+     -Duser.home=$homedir                              \
+     -application org.eclipse.ant.core.antRunner       \
+     -f build.xml build.update.jar
+popd
+
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -704,10 +738,9 @@
 
 ## The FileInitializer app isn't part of the SDK (yet?) but we want it to be
 ## around for other RPMs
-#cp equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
-#  $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-# Hack for 3.3M4
-cp %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
+cp equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
+#cp %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
 # Set up an extension location and a link file for the arch-specific dir
 echo "path:$RPM_BUILD_ROOT%{_libdir}" > $RPM_BUILD_ROOT%{_datadir}/%{name}/links/fragments.link
@@ -736,8 +769,7 @@
   $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 # FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug.
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu_3.6.0.20061215.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu.source_3.6.0.20061215 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu_3.6.1.v20070417.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 # FIXME: there is a problem with gjdoc generating different HTML on different
 # architectures.
@@ -777,11 +809,12 @@
 # 
 # Extract .so files
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
+LAUNCHERVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 pushd $RPM_BUILD_ROOT
 datadir_path=$(echo %{_datadir}/%{name} | sed -e 's/^\///')
 libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///')
 java -Dosgi.sharedConfiguration.area=$libdir_path/configuration \
-     -cp $datadir_path/startup.jar \
+     -cp $datadir_path/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
      org.eclipse.core.launcher.Main \
      -consolelog \
      -application org.eclipse.equinox.initializer.configInitializer \
@@ -918,81 +951,59 @@
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
 ## BEGIN ANT ##
-rm plugins/org.apache.ant_*/lib/ant-antlr.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-bcel.jar
-#rm plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-log4j.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-oro.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-regexp.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-resolver.jar
-rm plugins/org.apache.ant_*/lib/ant-commons-logging.jar
-#rm plugins/org.apache.ant_*/lib/ant-commons-net.jar
-#rm plugins/org.apache.ant_*/lib/ant-icontract.jar
-#rm plugins/org.apache.ant_*/lib/ant-jai.jar
-rm plugins/org.apache.ant_*/lib/ant.jar
-rm plugins/org.apache.ant_*/lib/ant-javamail.jar
-rm plugins/org.apache.ant_*/lib/ant-jdepend.jar
-#rm plugins/org.apache.ant_*/lib/ant-jmf.jar
-rm plugins/org.apache.ant_*/lib/ant-jsch.jar
-rm plugins/org.apache.ant_*/lib/ant-junit.jar
-rm plugins/org.apache.ant_*/lib/ant-launcher.jar
-#rm plugins/org.apache.ant_*/lib/ant-netrexx.jar
-rm plugins/org.apache.ant_*/lib/ant-nodeps.jar
-#rm plugins/org.apache.ant_*/lib/ant-starteam.jar
-#rm plugins/org.apache.ant_*/lib/ant-stylebook.jar
-rm plugins/org.apache.ant_*/lib/ant-swing.jar
-rm plugins/org.apache.ant_*/lib/ant-trax.jar
-#rm plugins/org.apache.ant_*/lib/ant-vaj.jar
-#rm plugins/org.apache.ant_*/lib/ant-weblogic.jar
-#rm plugins/org.apache.ant_*/lib/ant-xalan1.jar
-#rm plugins/org.apache.ant_*/lib/ant-xslp.jar
-# FIXME use build-jar-repository
-ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_1.6.5/lib/ant-antlr.jar
-ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-bcel.jar
-#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-bsf.jar
-ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-log4j.jar
-ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-oro.jar
-ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-regexp.jar
-ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-resolver.jar
-ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_1.6.5/lib/ant-commons-logging.jar
+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
+# 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
 # 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.6.5/lib/ant-commons-net.jar
-#ln -s %{_javadir}/ant/ant-icontract.jar plugins/org.apache.ant_1.6.5/lib/ant-icontract.jar
-#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant_1.6.5/lib/ant-jai.jar
-ln -s %{_javadir}/ant.jar plugins/org.apache.ant_1.6.5/lib/ant.jar
-ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_1.6.5/lib/ant-javamail.jar
-ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_1.6.5/lib/ant-jdepend.jar
-#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_1.6.5/lib/ant-jmf.jar
-ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_1.6.5/lib/ant-jsch.jar
-ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_1.6.5/lib/ant-junit.jar
-ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant_1.6.5/lib/ant-launcher.jar
-#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant_1.6.5/lib/ant-netrexx.jar
-ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_1.6.5/lib/ant-nodeps.jar
-#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant_1.6.5/lib/ant-starteam.jar
-#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant_1.6.5/lib/ant-stylebook.jar
-ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_1.6.5/lib/ant-swing.jar
-ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.6.5/lib/ant-trax.jar
-#ln -s %{_javadir}/ant/ant-vaj.jar plugins/org.apache.ant_1.6.5/lib/ant-vaj.jar
-#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant_1.6.5/lib/ant-weblogic.jar
-#ln -s %{_javadir}/ant/ant-xalan1.jar plugins/org.apache.ant_1.6.5/lib/ant-xalan1.jar
-#ln -s %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant_1.6.5/lib/ant-xslp.jar
+# 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
 ## END ANT ##
 
-# BEGIN LUCENE ##
-LUCENEPLUGINVERSION=$(ls plugins | grep lucene | sed 's/org.apache.lucene_//')
-rm plugins/org.apache.lucene_$LUCENEPLUGINVERSION/lucene-1.4.3.jar
-ln -s %{_javadir}/lucene.jar \
-  plugins/org.apache.lucene_$LUCENEPLUGINVERSION/lucene-1.4.3.jar
-# org.eclipse.platform.source is in the arch-specific location
-pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-PLATFORMSOURCEVERSION=$(ls plugins | grep platform.source_ | sed 's/org.eclipse.platform.source_//')
-rm plugins/org.eclipse.platform.source_$PLATFORMSOURCEVERSION/src/org.apache.lucene_$LUCENEPLUGINVERSION/lucene-1.4.3-src.zip
-ln -s %{_usr}/src/lucene/lucene-1.4.3.jar \
-  plugins/org.eclipse.platform.source_$PLATFORMSOURCEVERSION/src/org.apache.lucene_$LUCENEPLUGINVERSION/lucene-1.4.3-src.zip
-popd
-# END LUCENE ##
-
 ## BEGIN TOMCAT ##
 TOMCATPLUGINVERSION=$(ls plugins | grep tomcat | sed 's/org.eclipse.tomcat_//')
 mkdir -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib
@@ -1030,8 +1041,8 @@
 build-jar-repository -s -p plugins/org.junit_* junit
 
 # link to the jsch jar
-rm plugins/com.jcraft.jsch_0.1.28.jar
-ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.28.jar
+rm plugins/com.jcraft.jsch_0.1.31.jar
+ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
 
 # Ensure that the zip files are the same across all builds.
 # This is needed to make these package multilib compatible.
@@ -1237,8 +1248,6 @@
 %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles
 %{_datadir}/%{name}/plugins/org.eclipse.swt_*
 %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_*
-# FIXME: do we need to build?
-#%{_libdir}/%{name}/libcairo-swt.so
 %{_libdir}/%{name}/swt-gtk*.jar
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
@@ -1261,35 +1270,35 @@
 %ifarch %{ix86} x86_64
 %{_datadir}/%{name}/about.html
 %endif
-%{_datadir}/%{name}/startup.jar
 %ifarch x86_64
 %{_datadir}/%{name}/about_files
 %endif
 %{_datadir}/%{name}/readme
 %{_libdir}/%{name}/features/org.eclipse.rcp_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}_*
-%{_datadir}/%{name}/plugins/org.eclipse.equinox.launcher_*
-%{_datadir}/%{name}/plugins/org.eclipse.update.configurator_*
-%{_datadir}/%{name}/plugins/org.eclipse.osgi_*
-%{_datadir}/%{name}/plugins/org.eclipse.equinox.registry_*
-%{_datadir}/%{name}/plugins/org.eclipse.equinox.app_*
 %{_libdir}/%{name}/plugins/com.ibm.icu_*
-%{_datadir}/%{name}/plugins/org.eclipse.jface_*
-%{_datadir}/%{name}/plugins/org.eclipse.jface.databinding_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.commands_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.contenttype_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.databinding_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.databinding.beans_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.expressions_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.jobs_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.runtime_*
-%{_datadir}/%{name}/plugins/org.eclipse.equinox.preferences_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.expressions_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.app_*
 %{_datadir}/%{name}/plugins/org.eclipse.equinox.common_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.launcher_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.preferences_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.registry_*
 %{_datadir}/%{name}/plugins/org.eclipse.help_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.contenttype_*
+%{_datadir}/%{name}/plugins/org.eclipse.jface_*
+%{_datadir}/%{name}/plugins/org.eclipse.jface.databinding_*
+%{_datadir}/%{name}/plugins/org.eclipse.osgi_*
 %{_datadir}/%{name}/plugins/org.eclipse.rcp_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.databinding_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.databinding.beans_*
+%{_datadir}/%{name}/plugins/org.eclipse.swt_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.configurator_*
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}/org.eclipse.update.configurator_*
 %ifnarch ia64
@@ -1314,7 +1323,6 @@
 %{_libdir}/gcj/%{name}/org.eclipse.core.contenttype_*
 %{_libdir}/gcj/%{name}/org.eclipse.core.databinding_*
 %{_libdir}/gcj/%{name}/org.eclipse.core.databinding.beans_*
-%{_libdir}/gcj/%{name}/startup.jar*
 %endif
 
 %files rcp-sdk
@@ -1322,7 +1330,24 @@
 %{_datadir}/%{name}/features/org.eclipse.rcp.source_*
 %{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{eclipse_arch}*
 %{_datadir}/%{name}/plugins/org.eclipse.rcp.source_*
-%{_libdir}/%{name}/plugins/com.ibm.icu.source_*
+
+%files cvs-client
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.cvs_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ui_*
+%{_datadir}/%{name}/features/org.eclipse.cvs_*
+%if %{gcj_support}
+%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh2_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_*
+%endif
+
+%files cvs-client-sdk
+%{_datadir}/%{name}/plugins/org.eclipse.cvs.source_*
+%{_datadir}/%{name}/features/org.eclipse.cvs.source_*
 
 %files platform -f %{name}-platform.install
 %defattr(-,root,root)
@@ -1332,139 +1357,159 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/*/*/apps/*
 %{_datadir}/%{name}/features/org.eclipse.platform_*
-%{_datadir}/%{name}/features/org.eclipse.cvs_*
-%{_datadir}/%{name}/features/org.eclipse.cvs.source_*
-%{_datadir}/%{name}/plugins/org.eclipse.equinox.initializer_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.ide.application_*
-%{_datadir}/%{name}/plugins/org.eclipse.cvs_*
-%{_datadir}/%{name}/plugins/org.eclipse.cvs.source_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.forms_*
-%{_datadir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*
-%{_datadir}/%{name}/plugins/org.eclipse.debug.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.resources_*
-%{_datadir}/%{name}/plugins/org.eclipse.jface.text_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.intro_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.ide_*
 %{_datadir}/%{name}/plugins/com.jcraft.jsch_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*
+%{_datadir}/%{name}/plugins/javax.servlet_*
+%{_datadir}/%{name}/plugins/javax.servlet.jsp_*
+%{_datadir}/%{name}/plugins/org.apache.ant_*
+%{_datadir}/%{name}/plugins/org.apache.commons.el_*
+%{_datadir}/%{name}/plugins/org.apache.commons.logging_*
+%{_datadir}/%{name}/plugins/org.apache.jasper_*
+%{_datadir}/%{name}/plugins/org.apache.lucene_*
+%{_datadir}/%{name}/plugins/org.apache.lucene.analysis_*
 %{_datadir}/%{name}/plugins/org.eclipse.ant.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.help.appserver_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.browser_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.presentations.r21_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*
+%{_datadir}/%{name}/plugins/org.eclipse.compare_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.boot_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
 %ifarch %{ix86} x86_64
 %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_*
 %endif
+%{_datadir}/%{name}/plugins/org.eclipse.core.net_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.resources_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.variables_*
+%{_datadir}/%{name}/plugins/org.eclipse.debug.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.debug.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.http.jetty_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.http.registry_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper.registry_*
+%{_datadir}/%{name}/plugins/org.eclipse.help.appserver_*
 %{_datadir}/%{name}/plugins/org.eclipse.help.base_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_*
-%{_datadir}/%{name}/plugins/org.eclipse.compare_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.osgi.util_*
+%{_datadir}/%{name}/plugins/org.eclipse.help.ui_*
+%{_libdir}/%{name}/plugins/org.eclipse.help.webapp_*
+%{_datadir}/%{name}/plugins/org.eclipse.jface.text_*
+%{_datadir}/%{name}/plugins/org.eclipse.jsch.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.jsch.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*
+%{_datadir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*
 %{_datadir}/%{name}/plugins/org.eclipse.osgi.services_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.console_*
+%{_datadir}/%{name}/plugins/org.eclipse.osgi.util_*
 %{_datadir}/%{name}/plugins/org.eclipse.platform_*
-%{_datadir}/%{name}/plugins/org.eclipse.update.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.help.webapp_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*
+%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.user_*
+%{_datadir}/%{name}/plugins/org.eclipse.search_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.text_*
+%{_datadir}/%{name}/plugins/org.eclipse.tomcat_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.browser_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.console_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.editors_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.externaltools_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.forms_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.ide_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.ide.application_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.intro_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.intro.universal_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.net_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.presentations.r21_*
 %{_datadir}/%{name}/plugins/org.eclipse.ui.views_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
 %{_datadir}/%{name}/plugins/org.eclipse.update.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.intro.universal_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.boot_*
-%{_datadir}/%{name}/plugins/org.apache.ant_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.externaltools_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh_*
-%{_datadir}/%{name}/plugins/org.apache.lucene_*
+%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*
 %{_datadir}/%{name}/plugins/org.eclipse.update.scheduler_*
-%{_datadir}/%{name}/plugins/org.eclipse.debug.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.help.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.editors_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
-%{_datadir}/%{name}/plugins/org.eclipse.tomcat_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.user_*
-%{_datadir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
-%{_datadir}/%{name}/plugins/org.eclipse.text_*
-%{_datadir}/%{name}/plugins/org.eclipse.search_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.ui_*
+%{_datadir}/%{name}/plugins/org.mortbay.jetty_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.initializer_*
 %if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.equinox.initializer_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator.resources_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.ide.application_*
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator_*
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_*
-%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_*
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_*
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_*
-%{_libdir}/gcj/%{name}/org.eclipse.cvs_*
-#%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_*
-%ifnarch ia64
-%{_libdir}/gcj/%{name}/com.jcraft.jsch_*
-%endif
-%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_*
+%{_libdir}/gcj/%{name}/javax.servlet_*
+%{_libdir}/gcj/%{name}/javax.servlet.jsp_*
+%{_libdir}/gcj/%{name}/org.apache.commons.el_*
+%{_libdir}/gcj/%{name}/org.apache.commons.logging_*
+%{_libdir}/gcj/%{name}/org.apache.jasper_*
+%{_libdir}/gcj/%{name}/org.apache.lucene_*
+%{_libdir}/gcj/%{name}/org.apache.lucene.analysis_*
 %{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_*
-%{_libdir}/gcj/%{name}/org.eclipse.team.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.compare_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.filesystem_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.net_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_*
 %{_libdir}/gcj/%{name}/org.eclipse.core.variables_*
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.http.jetty_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.http.servlet_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.jsp.jasper_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.jsp.jasper.registry_*
+%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_*
 %{_libdir}/gcj/%{name}/org.eclipse.help.base_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.views.properties.tabbed_*
-%{_libdir}/gcj/%{name}/org.eclipse.compare_*
-%{_libdir}/gcj/%{name}/org.eclipse.team.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_*
+%{_libdir}/gcj/%{name}/org.eclipse.help.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.help.webapp_*
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_*
+%{_libdir}/gcj/%{name}/org.eclipse.jsch.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.jsch.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_*
+%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_*
 %{_libdir}/gcj/%{name}/org.eclipse.osgi.services_*
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_*
+%{_libdir}/gcj/%{name}/org.eclipse.search_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.text_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_*
 %{_libdir}/gcj/%{name}/org.eclipse.ui.console_*
-%{_libdir}/gcj/%{name}/org.eclipse.update.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.ide.application_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator.resources_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.net_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_*
 %{_libdir}/gcj/%{name}/org.eclipse.ui.views_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.views.properties.tabbed_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_*
 %{_libdir}/gcj/%{name}/org.eclipse.update.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_*
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh2_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_*
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh_*
 %{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_*
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.help.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.filesystem_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_*
-%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_*
-%{_libdir}/gcj/%{name}/org.eclipse.text_*
-%{_libdir}/gcj/%{name}/org.eclipse.search_*
-%{_libdir}/gcj/%{name}/universal.jar*
-%{_libdir}/gcj/%{name}/webapp.jar*
-%{_libdir}/gcj/%{name}/tomcatwrapper.jar*
-%{_libdir}/gcj/%{name}/compatibility.jar*
-%{_libdir}/gcj/%{name}/platform.jar*
-%{_libdir}/gcj/%{name}/runtime_registry_compatibility.jar*
-%{_libdir}/gcj/%{name}/servlets.jar*
-# FIXME:  we need to symlink these
-%{_libdir}/gcj/%{name}/ant-apache-bsf.jar*
-%{_libdir}/gcj/%{name}/jsp.jar*
-%{_libdir}/gcj/%{name}/parser.jar*
+%{_libdir}/gcj/%{name}/org.eclipse.update.ui_*
+%{_libdir}/gcj/%{name}/org.mortbay.jetty_*
+%{_libdir}/gcj/%{name}/compatibility.*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.http.registry_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.initializer_*
+%{_libdir}/gcj/%{name}/platform.jar.*
+%{_libdir}/gcj/%{name}/runtime_registry_compatibility.jar.*
+%{_libdir}/gcj/%{name}/tomcatwrapper.jar.*
+%{_libdir}/gcj/%{name}/universal.jar.*
 %endif
 
 %files platform-sdk
 %defattr(-,root,root)
 %{_datadir}/%{name}/features/org.eclipse.platform.source_*
-%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_*
+%{_datadir}/%{name}/plugins/javax.servlet.jsp.source_*
+%{_datadir}/%{name}/plugins/javax.servlet.source_*
+%{_datadir}/%{name}/plugins/org.apache.ant.source_*
+%{_datadir}/%{name}/plugins/org.apache.commons.el.source_*
+%{_datadir}/%{name}/plugins/org.apache.commons.logging.source_*
+%{_datadir}/%{name}/plugins/org.apache.jasper.source_*
+%{_datadir}/%{name}/plugins/org.apache.lucene.analysis.source_*
+%{_datadir}/%{name}/plugins/org.apache.lucene.source_*
 %{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_*
 %{_libdir}/%{name}/plugins/org.eclipse.platform.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_*
+%{_datadir}/%{name}/plugins/org.mortbay.jetty.source_*
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}/org.eclipse.platform.doc.isv_*
 %endif
@@ -1489,19 +1534,19 @@
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*
 %if %{gcj_support}
-%{_libdir}/gcj/%{name}/junit-4.1.jar*
 %{_libdir}/gcj/%{name}/org.eclipse.ant.ui_*
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.core_*
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_*
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.junit4.runtime_*
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit.runtime_*
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit_*
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_*
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.core.manipulation_*
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.ui_*
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_*
-%{_libdir}/gcj/%{name}/junitruntime.jar.*
-%{_libdir}/gcj/%{name}/junitsupport.jar.*
 %{_libdir}/gcj/%{name}/jdimodel.jar.*
 %{_libdir}/gcj/%{name}/jdi.jar.*
+%{_libdir}/gcj/%{name}/junit.jar.*
 %endif
 
 %files jdt-sdk
@@ -1509,6 +1554,7 @@
 %{_datadir}/%{name}/features/org.eclipse.jdt.source_*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.source_*
+%{_datadir}/%{name}/plugins/org.junit.source_*
 
 %files pde
 %defattr(-,root,root)
@@ -1550,7 +1596,13 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
-* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.M5eh
+* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC3
+- 3.3RC3.
+
+* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC2
+- 3.3RC2.
+
+* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC1
 - 3.3RC1.
 - Pull in changes from F-7.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	24 May 2007 05:51:41 -0000	1.41
+++ sources	6 Jun 2007 03:22:53 -0000	1.42
@@ -1,4 +1,4 @@
 c3be75d8af3c31b7a1748247ab3fee95  icu4jsrc_3_4_5.jar
 627db0c5033547a48370a5e45a89d2f1  eclipse-fedora-splash-3.2.1.png
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
-a32db71d03d7e70e37ec1cc7ea199a34  eclipse-sourceBuild-srcIncluded-3.3RC1.zip
+3a8296d334f894ef1d87edb5303ca73f  eclipse-sourceBuild-srcIncluded-3.3RC3.zip

More information about the fedora-extras-commits mailing list