[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/eclipse/devel eclipse-efj-wrapper.sh, NONE, 1.1 .cvsignore, 1.11, 1.12 eclipse-build-activeHelpSample.jar.patch, 1.1, 1.2 eclipse-platform.install, 1.3, 1.4 eclipse-s390ands390x.patch, 1.3, 1.4 eclipse.spec, 1.102, 1.103 sources, 1.21, 1.22 eclipse-antsecuritymanager.patch, 1.1, NONE eclipse-bootstrap.patch, 1.2, NONE eclipse-bootstrapbuild.patch, 1.1, NONE eclipse-nobootstrapbuild.patch, 1.1, NONE eclipse-pdebuildtarargs.patch, 1.1, NONE eclipse-redhat-splash.png, 1.1, NONE eclipse-swtbuild.patch, 1.1, NONE



Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30772

Modified Files:
	.cvsignore eclipse-build-activeHelpSample.jar.patch 
	eclipse-platform.install eclipse-s390ands390x.patch 
	eclipse.spec sources 
Added Files:
	eclipse-efj-wrapper.sh 
Removed Files:
	eclipse-antsecuritymanager.patch eclipse-bootstrap.patch 
	eclipse-bootstrapbuild.patch eclipse-nobootstrapbuild.patch 
	eclipse-pdebuildtarargs.patch eclipse-redhat-splash.png 
	eclipse-swtbuild.patch 
Log Message:
- Update to 3.1M6.
- Change bootstrap procedure to match the upstream method.
- Remove patches that were fixed upstream.
- Add efj wrapper script.



--- NEW FILE eclipse-efj-wrapper.sh ---
#!/bin/sh

java -cp startup.jar org.eclipse.core.launcher.Main \
     -application org.eclipse.jdt.core.JavaCodeFormatter \
     ${1+"$@"}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Mar 2005 03:35:45 -0000	1.11
+++ .cvsignore	17 Apr 2005 04:26:54 -0000	1.12
@@ -1,3 +1,2 @@
-eclipse-sourceBuild-srcIncluded-3.1M5a.zip
-eclipse-native-splash-3.1-M-build.png
-eclipse-native-splash-3.1.png
+eclipse-sourceBuild-srcIncluded-3.1M6.zip
+eclipse-native-splash-3.1-M6.png

eclipse-build-activeHelpSample.jar.patch:
 .classpath                                                                  |    7 +
 .project                                                                    |    1 
 build.xml                                                                   |   60 +++++++++-
 src/org/eclipse/platform/doc/isv/activeHelp/ActiveHelpOpenDialogAction.java |   41 ++++++
 4 files changed, 106 insertions(+), 3 deletions(-)

Index: eclipse-build-activeHelpSample.jar.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-build-activeHelpSample.jar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-build-activeHelpSample.jar.patch	8 Mar 2005 03:35:45 -0000	1.1
+++ eclipse-build-activeHelpSample.jar.patch	17 Apr 2005 04:26:54 -0000	1.2
@@ -52,8 +52,8 @@
 +			<javac destdir="${temp.folder}/activeHelpSample.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}"		>
 +				<compilerarg line="${compilerArg}"/>
 +				<classpath>
-+					<pathelement path="../org.eclipse.help/help.jar"/>
-+					<pathelement path="../org.eclipse.jface/jface.jar"/><pathelement path="../org.eclipse.swt/ws/${ws}/swt.jar"/>
++					<pathelement path="../org.eclipse.help/@dot"/>
++					<pathelement path="../org.eclipse.jface/@dot"/><pathelement path="../org.eclipse.swt/ws/${ws}/swt.jar"/>
 +					<pathelement path="../org.eclipse.swt.gtk64/ws/${ws}/swt.jar"/>
 +					<pathelement path="../org.eclipse.swt.gtk64/ws/gtk/swt-pi.jar"/>
 +					<pathelement path="../org.eclipse.swt.win32/ws/${ws}/swt.jar"/>
@@ -71,7 +71,7 @@
 +					<pathelement path="../org.eclipse.swt.carbon/ws/carbon/swt-pi.jar"/>
 +					<pathelement path="../org.eclipse.swt.photon/ws/${ws}/swt.jar"/>
 +					<pathelement path="../org.eclipse.swt.photon/@dot"/>
-+					<pathelement path="../org.eclipse.ui.workbench/workbench.jar"/>
++					<pathelement path="../org.eclipse.ui.workbench/@dot"/>
 +				</classpath>
 +				<src path="src/"/>
 +			</javac>


Index: eclipse-platform.install
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-platform.install,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-platform.install	21 Feb 2005 00:31:38 -0000	1.3
+++ eclipse-platform.install	17 Apr 2005 04:26:54 -0000	1.4
@@ -1,5 +1,7 @@
+/usr/share/eclipse/.options
+/usr/share/eclipse/eclipse.ini
 /usr/share/eclipse/configuration/config.ini
-/usr/share/eclipse/cpl-v10.html
+/usr/share/eclipse/epl-v10.html
 /usr/share/eclipse/notice.html
 /usr/share/eclipse/readme/readme_eclipse.html
 /usr/share/eclipse/plugins/org.apache.ant_1.*
@@ -41,6 +43,7 @@
 /usr/share/eclipse/plugins/org.eclipse.team.ui_3.*
 /usr/share/eclipse/plugins/org.eclipse.text_3.*
 /usr/share/eclipse/plugins/org.eclipse.tomcat_4.*
+/usr/share/eclipse/plugins/org.eclipse.ui.browser_3.*
 /usr/share/eclipse/plugins/org.eclipse.ui.cheatsheets_3.*
 /usr/share/eclipse/plugins/org.eclipse.ui.console_3.*
 /usr/share/eclipse/plugins/org.eclipse.ui.externaltools_3.*

eclipse-s390ands390x.patch:
 assemble.org.eclipse.sdk.all.xml                                                                   |    6 
 assemble.org.eclipse.sdk.linux.gtk.s390.xml                                                        |  336 ++++++++++
 assemble.org.eclipse.sdk.linux.gtk.s390x.xml                                                       |  336 ++++++++++
 build                                                                                              |    2 
 build.xml                                                                                          |    4 
 features/org.eclipse.jdt.source/build.xml                                                          |    4 
 features/org.eclipse.jdt/build.xml                                                                 |   12 
 features/org.eclipse.launchers/build.xml                                                           |    4 
 features/org.eclipse.launchers/feature.xml                                                         |    2 
 features/org.eclipse.launchers/library/gtk/build.sh                                                |    8 
 features/org.eclipse.launchers/target.build.properties                                             |    4 
 features/org.eclipse.pde.source/build.xml                                                          |    4 
 features/org.eclipse.pde/build.xml                                                                 |    4 
 features/org.eclipse.platform.source/build.xml                                                     |   16 
 features/org.eclipse.platform.source/feature.xml                                                   |    2 
 features/org.eclipse.platform/build.properties                                                     |    2 
 features/org.eclipse.platform/build.xml                                                            |   20 
 features/org.eclipse.platform/feature.xml                                                          |    6 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties                                     |    3 
 plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml                                         |   18 
 plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties                                    |    3 
 plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml                                        |   18 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    1 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |   16 
 plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties                                     |    3 
 plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml                                         |   18 
 plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties                                    |    3 
 plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml                                        |   18 
 plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties                                |    3 
 plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml                                       |  105 +++
 plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml                                    |   18 
 plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties                               |    3 
 plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml                                      |  105 +++
 plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml                                   |   18 
 35 files changed, 1123 insertions(+), 6 deletions(-)

Index: eclipse-s390ands390x.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-s390ands390x.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-s390ands390x.patch	7 Mar 2005 21:51:53 -0000	1.3
+++ eclipse-s390ands390x.patch	17 Apr 2005 04:26:54 -0000	1.4
@@ -1,6 +1,6 @@
-diff -uNr eclipse-3.1.0_fc/assemble.org.eclipse.sdk.all.xml eclipse-3.1.0_fc.withs390ands390x/assemble.org.eclipse.sdk.all.xml
---- eclipse-3.1.0_fc/assemble.org.eclipse.sdk.all.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/assemble.org.eclipse.sdk.all.xml	2005-03-07 10:28:43.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/assemble.org.eclipse.sdk.all.xml eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.all.xml
+--- eclipse-3.1.0_fc/assemble.org.eclipse.sdk.all.xml	2005-04-01 16:54:41.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.all.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -19,6 +19,12 @@
  		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.x86_64">
  			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.gtk.x86_64.xml"/>
@@ -14,9 +14,9 @@
  		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.motif.x86">
  			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.motif.x86.xml"/>
  		</ant>
-diff -uNr eclipse-3.1.0_fc/assemble.org.eclipse.sdk.linux.gtk.s390.xml eclipse-3.1.0_fc.withs390ands390x/assemble.org.eclipse.sdk.linux.gtk.s390.xml
+diff -ruN eclipse-3.1.0_fc/assemble.org.eclipse.sdk.linux.gtk.s390.xml eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.linux.gtk.s390.xml
 --- eclipse-3.1.0_fc/assemble.org.eclipse.sdk.linux.gtk.s390.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/assemble.org.eclipse.sdk.linux.gtk.s390.xml	2005-03-07 10:27:55.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.linux.gtk.s390.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -0,0 +1,336 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project name="Assemble org.eclipse.sdk" default="main">
@@ -354,9 +354,9 @@
 +		</exec>
 +	</target>
 +</project>
-diff -uNr eclipse-3.1.0_fc/assemble.org.eclipse.sdk.linux.gtk.s390x.xml eclipse-3.1.0_fc.withs390ands390x/assemble.org.eclipse.sdk.linux.gtk.s390x.xml
+diff -ruN eclipse-3.1.0_fc/assemble.org.eclipse.sdk.linux.gtk.s390x.xml eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.linux.gtk.s390x.xml
 --- eclipse-3.1.0_fc/assemble.org.eclipse.sdk.linux.gtk.s390x.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/assemble.org.eclipse.sdk.linux.gtk.s390x.xml	2005-03-07 11:37:44.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.linux.gtk.s390x.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -0,0 +1,336 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project name="Assemble org.eclipse.sdk" default="main">
@@ -694,21 +694,21 @@
 +		</exec>
 +	</target>
 +</project>
-diff -uNr eclipse-3.1.0_fc/build eclipse-3.1.0_fc.withs390ands390x/build
---- eclipse-3.1.0_fc/build	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/build	2005-03-07 10:29:32.000000000 -0500
-@@ -53,7 +53,7 @@
+diff -ruN eclipse-3.1.0_fc/build eclipse-3.1.0_fc.with-s390/build
+--- eclipse-3.1.0_fc/build	2005-04-14 15:49:33.000000000 -0400
++++ eclipse-3.1.0_fc.with-s390/build	2005-04-14 15:56:36.000000000 -0400
+@@ -52,7 +52,7 @@
  	exit 1
  fi
  
 -if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ]
 +if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] ||  [ "$os-$ws-$arch" = "linux-gtk-s390x" ]
  then
- 	ant -q -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch $compilelibs $bootclasspath
- else
-diff -uNr eclipse-3.1.0_fc/build.xml eclipse-3.1.0_fc.withs390ands390x/build.xml
---- eclipse-3.1.0_fc/build.xml	2005-03-07 15:02:50.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/build.xml	2005-03-07 11:41:09.000000000 -0500
+ 	ORIGCLASSPATH=$CLASSPATH
+ 	ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
+diff -ruN eclipse-3.1.0_fc/build.xml eclipse-3.1.0_fc.with-s390/build.xml
+--- eclipse-3.1.0_fc/build.xml	2005-04-14 15:49:33.000000000 -0400
++++ eclipse-3.1.0_fc.with-s390/build.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -48,12 +48,14 @@
  				<equals arg1="${installOs}-${installWs}-${installArch}"	arg2="linux-gtk-ppc64"/>
  				<equals arg1="${installOs}-${installWs}-${installArch}"	arg2="linux-gtk-ia64"/>
@@ -724,7 +724,7 @@
  			</or>
  		</condition>
  		<condition property="wsType" value="motif">
-@@ -208,6 +210,8 @@
+@@ -210,6 +212,8 @@
  				<equals arg1="${installOs}-${installWs}-${installArch}"	arg2="linux-gtk-ppc"/>
  				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ppc64"/>
  				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ia64"/>
@@ -733,9 +733,9 @@
  				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-ia64"/>
  			</or>
  		</condition> 
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.jdt/build.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.jdt/build.xml
---- eclipse-3.1.0_fc/features/org.eclipse.jdt/build.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.jdt/build.xml	2005-03-07 16:18:27.882582188 -0500
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.jdt/build.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.jdt/build.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.jdt/build.xml	2005-04-01 16:54:42.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.jdt/build.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -173,6 +173,18 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  		</copy>
@@ -755,9 +755,9 @@
  	<target name="rootFileslinux_motif_x86">
  		<mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/>
  		<copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true">
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.jdt.source/build.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.jdt.source/build.xml
---- eclipse-3.1.0_fc/features/org.eclipse.jdt.source/build.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.jdt.source/build.xml	2005-03-07 10:47:59.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.jdt.source/build.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.jdt.source/build.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.jdt.source/build.xml	2005-04-01 16:54:42.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.jdt.source/build.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -94,6 +94,10 @@
  	</target>
  	<target name="rootFileslinux_gtk_x86_64">
@@ -769,9 +769,9 @@
  	<target name="rootFileslinux_motif_x86">
  	</target>
  	<target name="rootFilessolaris_motif_sparc">
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.launchers/build.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.launchers/build.xml
---- eclipse-3.1.0_fc/features/org.eclipse.launchers/build.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.launchers/build.xml	2005-03-07 10:45:59.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.launchers/build.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.launchers/build.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.launchers/build.xml	2005-04-01 16:54:41.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.launchers/build.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -55,7 +55,7 @@
  		<delete dir="${feature.temp.folder}"/>
  		<mkdir dir="${feature.temp.folder}"/>
@@ -790,9 +790,9 @@
  			<param name="ws" value="carbon,gtk,motif,photon,win32"/>
  			<param name="nl" value="*"/>
  			<param name="include.children" value="true"/>
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.launchers/feature.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.launchers/feature.xml
---- eclipse-3.1.0_fc/features/org.eclipse.launchers/feature.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.launchers/feature.xml	2005-03-07 10:44:58.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.launchers/feature.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.launchers/feature.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.launchers/feature.xml	2005-04-01 16:55:54.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.launchers/feature.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -5,7 +5,7 @@
        version="3.1.0"
        os="aix,hpux,linux,macosx,qnx,solaris,win32"
@@ -802,9 +802,9 @@
  
     <description>
        %description
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.launchers/library/gtk/build.sh eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.launchers/library/gtk/build.sh
---- eclipse-3.1.0_fc/features/org.eclipse.launchers/library/gtk/build.sh	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.launchers/library/gtk/build.sh	2005-03-07 10:46:32.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.launchers/library/gtk/build.sh eclipse-3.1.0_fc.with-s390/features/org.eclipse.launchers/library/gtk/build.sh
+--- eclipse-3.1.0_fc/features/org.eclipse.launchers/library/gtk/build.sh	2005-04-01 16:57:19.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.launchers/library/gtk/build.sh	2005-04-14 15:56:36.000000000 -0400
 @@ -62,6 +62,14 @@
  				defaultOSArch="ia64"
  				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
@@ -820,10 +820,10 @@
  			*)
  				echo "*** Unknown MODEL <${MODEL}>"
  				;;
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.launchers/target.build.properties eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.launchers/target.build.properties
---- eclipse-3.1.0_fc/features/org.eclipse.launchers/target.build.properties	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.launchers/target.build.properties	2005-03-07 10:47:17.000000000 -0500
-@@ -27,4 +27,6 @@
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.launchers/target.build.properties eclipse-3.1.0_fc.with-s390/features/org.eclipse.launchers/target.build.properties
+--- eclipse-3.1.0_fc/features/org.eclipse.launchers/target.build.properties	2005-04-01 16:56:11.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.launchers/target.build.properties	2005-04-14 15:56:36.000000000 -0400
+@@ -37,4 +37,6 @@
  root.linux.gtk.ppc=../../launchertmp
  root.linux.gtk.ppc64=../../launchertmp
  root.linux.gtk.ia64=../../launchertmp
@@ -832,9 +832,9 @@
 +root.hpux.motif.ia64=../../launchertmp
 +root.linux.gtk.s390=../../launchertmp
 +root.linux.gtk.s390x=../../launchertmp
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.pde/build.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.pde/build.xml
---- eclipse-3.1.0_fc/features/org.eclipse.pde/build.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.pde/build.xml	2005-03-07 10:48:38.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.pde/build.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.pde/build.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.pde/build.xml	2005-04-01 16:54:42.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.pde/build.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -114,6 +114,10 @@
  	</target>
  	<target name="rootFileslinux_gtk_x86_64">
@@ -846,9 +846,9 @@
  	<target name="rootFileslinux_motif_x86">
  	</target>
  	<target name="rootFilessolaris_motif_sparc">
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.pde.source/build.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.pde.source/build.xml
---- eclipse-3.1.0_fc/features/org.eclipse.pde.source/build.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.pde.source/build.xml	2005-03-07 10:31:11.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.pde.source/build.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.pde.source/build.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.pde.source/build.xml	2005-04-01 16:54:41.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.pde.source/build.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -84,6 +84,10 @@
  	</target>
  	<target name="rootFileslinux_gtk_x86_64">
@@ -860,22 +860,19 @@
  	<target name="rootFileslinux_motif_x86">
  	</target>
  	<target name="rootFilessolaris_motif_sparc">
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.platform/build.properties eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/build.properties
---- eclipse-3.1.0_fc/features/org.eclipse.platform/build.properties	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/build.properties	2005-03-07 10:50:35.000000000 -0500
-@@ -45,4 +45,6 @@
- root.linux.gtk.ppc=../../launchertmp,gtk
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.platform/build.properties eclipse-3.1.0_fc.with-s390/features/org.eclipse.platform/build.properties
+--- eclipse-3.1.0_fc/features/org.eclipse.platform/build.properties	2005-04-01 16:55:10.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.platform/build.properties	2005-04-14 15:58:06.000000000 -0400
+@@ -45,3 +45,5 @@
  root.linux.gtk.ppc64=../../launchertmp,gtk
  root.linux.gtk.ia64=../../launchertmp,gtk
--root.hpux.motif.ia64=../../launchertmp,motif
-\ No newline at end of file
-+root.hpux.motif.ia64=../../launchertmp,motif
+ root.hpux.motif.ia64=../../launchertmp,motif
 +root.linux.gtk.s390=../../launchertmp,gtk
 +root.linux.gtk.s390x=../../launchertmp,gtk
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.platform/build.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/build.xml
---- eclipse-3.1.0_fc/features/org.eclipse.platform/build.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/build.xml	2005-03-07 14:59:31.000000000 -0500
-@@ -83,6 +83,16 @@
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.platform/build.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.platform/build.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.platform/build.xml	2005-04-01 16:54:42.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.platform/build.xml	2005-04-14 15:56:36.000000000 -0400
+@@ -53,6 +53,16 @@
  			<property name="ws" value="gtk"/>
  		</ant>
  		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk" target="${target}">
@@ -892,9 +889,9 @@
  			<property name="arch" value="sparc"/>
  			<property name="os" value="solaris"/>
  			<property name="ws" value="gtk"/>
-@@ -112,6 +122,16 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
+@@ -87,6 +97,16 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
  		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk64" target="${target}">
 +			<property name="arch" value="s390x"/>
@@ -909,12 +906,12 @@
  		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32" target="${target}">
  			<property name="arch" value="x86"/>
  			<property name="os" value="win32"/>
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.platform/feature.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/feature.xml
---- eclipse-3.1.0_fc/features/org.eclipse.platform/feature.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/feature.xml	2005-03-07 10:49:21.000000000 -0500
-@@ -375,6 +375,12 @@
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.platform/feature.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.platform/feature.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.platform/feature.xml	2005-04-01 16:55:51.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.platform/feature.xml	2005-04-14 15:56:36.000000000 -0400
+@@ -403,6 +403,12 @@
    <!-- LINUX GTK ppc64-->
-   <plugin id="org.eclipse.swt.gtk64" download-size="0" install-size="0" version="0.0.0"  fragment="true" os="linux" ws="gtk" arch="ppc64" />
+   <plugin id="org.eclipse.swt.gtk64" download-size="0" install-size="0" version="0.0.0"  fragment="true" os="linux" ws="gtk" arch="ppc64" unpack="false"/>
  
 +  <!-- LINUX GTK s390-->
 +  <plugin id="org.eclipse.swt.gtk" download-size="0" install-size="0" version="0.0.0"  fragment="true" os="linux" ws="gtk" arch="s390" />
@@ -923,54 +920,14 @@
 +  <plugin id="org.eclipse.swt.gtk64" download-size="0" install-size="0" version="0.0.0"  fragment="true" os="linux" ws="gtk" arch="s390x" />
 +
    <!-- LINUX Motif-->    
-   <plugin id="org.eclipse.swt.motif" download-size="0" install-size="0" version="0.0.0" fragment="true" os="linux" ws="motif"/>
- 
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.platform/gtk/configuration/config.ini eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/gtk/configuration/config.ini
---- eclipse-3.1.0_fc/features/org.eclipse.platform/gtk/configuration/config.ini	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/gtk/configuration/config.ini	2005-03-07 13:37:49.000000000 -0500
-@@ -61,4 +61,4 @@
- osgi.ws=gtk
- 
- # End of file marker - must be here
--eof=eof
-\ No newline at end of file
-+eof=eof
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.platform/macosx.carbon/configuration/config.ini eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/macosx.carbon/configuration/config.ini
---- eclipse-3.1.0_fc/features/org.eclipse.platform/macosx.carbon/configuration/config.ini	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/macosx.carbon/configuration/config.ini	2005-03-07 13:37:46.000000000 -0500
-@@ -59,4 +59,4 @@
- 
- 
- # End of file marker - must be here
--eof=eof
-\ No newline at end of file
-+eof=eof
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.platform/motif/configuration/config.ini eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/motif/configuration/config.ini
---- eclipse-3.1.0_fc/features/org.eclipse.platform/motif/configuration/config.ini	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/motif/configuration/config.ini	2005-03-07 13:37:52.000000000 -0500
-@@ -59,4 +59,4 @@
- 
- 
- # End of file marker - must be here
--eof=eof
-\ No newline at end of file
-+eof=eof
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.platform/win32/configuration/config.ini eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/win32/configuration/config.ini
---- eclipse-3.1.0_fc/features/org.eclipse.platform/win32/configuration/config.ini	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform/win32/configuration/config.ini	2005-03-07 13:37:53.000000000 -0500
-@@ -58,4 +58,4 @@
- eclipse buildId= build@
+   <plugin id="org.eclipse.swt.motif" download-size="0" install-size="0" version="0.0.0" fragment="true" os="linux" ws="motif" unpack="false"/>
  
- # End of file marker - must be here
--eof=eof
-\ No newline at end of file
-+eof=eof
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.platform.source/build.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform.source/build.xml
---- eclipse-3.1.0_fc/features/org.eclipse.platform.source/build.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform.source/build.xml	2005-03-07 15:58:00.000000000 -0500
-@@ -22,6 +22,16 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.platform.source/build.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.platform.source/build.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.platform.source/build.xml	2005-04-01 16:54:41.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.platform.source/build.xml	2005-04-14 15:56:36.000000000 -0400
+@@ -32,6 +32,16 @@
+ 			<property name="os" value="aix"/>
+ 			<property name="ws" value="motif"/>
  		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.gtk.s390" target="${target}">
 +			<property name="arch" value="s390"/>
@@ -987,7 +944,7 @@
  			<property name="os" value="win32"/>
 @@ -144,7 +154,7 @@
  		<copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.0" failonerror="true">
- 			<fileset dir="${basedir}" includes="cpl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
+ 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
  		</copy>
 -		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,"/>
 +		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,org.eclipse.platform.source.linux.gtk.s390,3.1.0,org.ecli!
pse.platform.source.linux.gtk.s390x,3.1.0,"/>
@@ -1005,9 +962,9 @@
  	<target name="rootFileslinux_motif_x86">
  	</target>
  	<target name="rootFilessolaris_motif_sparc">
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.platform.source/feature.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform.source/feature.xml
---- eclipse-3.1.0_fc/features/org.eclipse.platform.source/feature.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.platform.source/feature.xml	2005-03-07 10:41:34.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.platform.source/feature.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.platform.source/feature.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.platform.source/feature.xml	2005-04-01 16:54:41.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.platform.source/feature.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -22,6 +22,8 @@
  	<plugin ws="gtk"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.solaris.gtk.sparc" version="3.1.0"/>
  	<plugin ws="carbon"  os="macosx" fragment="true" arch="ppc" download-size="0" install-size="0" id="org.eclipse.platform.source.macosx.carbon.ppc" version="3.1.0"/>
@@ -1017,9 +974,9 @@
  	<plugin ws="motif"  os="aix" fragment="true" arch="ppc" download-size="0" install-size="0" id="org.eclipse.platform.source.aix.motif.ppc" version="3.1.0"/>
  	<plugin ws="win32"  os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.1.0"/>
  	<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.1.0"/>
-diff -uNr eclipse-3.1.0_fc/features/org.eclipse.sdk/build.xml eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.sdk/build.xml
---- eclipse-3.1.0_fc/features/org.eclipse.sdk/build.xml	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/features/org.eclipse.sdk/build.xml	2005-03-07 10:48:17.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/features/org.eclipse.sdk/build.xml eclipse-3.1.0_fc.with-s390/features/org.eclipse.sdk/build.xml
+--- eclipse-3.1.0_fc/features/org.eclipse.sdk/build.xml	2005-04-01 16:54:42.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/features/org.eclipse.sdk/build.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -90,6 +90,10 @@
  	</target>
  	<target name="rootFileslinux_gtk_x86_64">
@@ -1031,52 +988,16 @@
  	<target name="rootFileslinux_motif_x86">
  	</target>
  	<target name="rootFilessolaris_motif_sparc">
-Binary files eclipse-3.1.0_fc/jdtCompilerAdapter.jar and eclipse-3.1.0_fc.withs390ands390x/jdtCompilerAdapter.jar differ
-Binary files eclipse-3.1.0_fc/jdtcore.jar and eclipse-3.1.0_fc.withs390ands390x/jdtcore.jar differ
-Binary files eclipse-3.1.0_fc/plugins/org.apache.ant/lib/ant-netrexx.jar and eclipse-3.1.0_fc.withs390ands390x/plugins/org.apache.ant/lib/ant-netrexx.jar differ
-Binary files eclipse-3.1.0_fc/plugins/org.apache.lucene/parser.jar and eclipse-3.1.0_fc.withs390ands390x/plugins/org.apache.lucene/parser.jar differ
-\ No newline at end of file
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.jdt/about.mappings eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt/about.mappings
---- eclipse-3.1.0_fc/plugins/org.eclipse.jdt/about.mappings	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt/about.mappings	2005-03-07 11:55:25.000000000 -0500
-@@ -3,4 +3,4 @@
- # java.io.Properties file (ISO 8859-1 with "\" escapes)
- # This file does not need to be translated.
- 
--0= build@
-\ No newline at end of file
-+0= build@
-Binary files eclipse-3.1.0_fc/plugins/org.eclipse.jdt.core/scripts/GenerateBuildScript.class and eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.core/scripts/GenerateBuildScript.class differ
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.jdt.doc.isv/about.mappings eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.doc.isv/about.mappings
---- eclipse-3.1.0_fc/plugins/org.eclipse.jdt.doc.isv/about.mappings	2005-03-07 15:02:50.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.doc.isv/about.mappings	2005-03-07 11:55:59.000000000 -0500
-@@ -3,4 +3,4 @@
- # java.io.Properties file (ISO 8859-1 with "\" escapes)
- # This file does not need to be translated.
- 
--0= build@
-\ No newline at end of file
-+0= build@
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.jdt.doc.user/about.mappings eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.doc.user/about.mappings
---- eclipse-3.1.0_fc/plugins/org.eclipse.jdt.doc.user/about.mappings	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.doc.user/about.mappings	2005-03-07 11:55:23.000000000 -0500
-@@ -3,4 +3,4 @@
- # java.io.Properties file (ISO 8859-1 with "\" escapes)
- # This file does not need to be translated.
- 
--0= build@
-\ No newline at end of file
-+0= build@
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties
 --- eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties	2005-03-07 11:09:03.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties	2005-04-14 15:56:36.000000000 -0400
 @@ -0,0 +1,3 @@
 +#Sat Feb 19 15:09:11 EST 2005
 +bin.includes=fragment.xml,src/**
 +sourcePlugin=true
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml
 --- eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml	2005-03-07 11:09:33.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<?eclipse version="3.0"?>
@@ -1096,16 +1017,16 @@
 +  </extension>
 +
 +</fragment>
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties
 --- eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties	2005-02-22 10:28:18.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties	2005-04-14 15:56:36.000000000 -0400
 @@ -0,0 +1,3 @@
 +#Sat Feb 19 15:09:11 EST 2005
 +bin.includes=fragment.xml,src/**
 +sourcePlugin=true
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml
 --- eclipse-3.1.0_fc/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml	2005-02-22 10:28:18.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<?eclipse version="3.0"?>
@@ -1125,18 +1046,18 @@
 +  </extension>
 +
 +</fragment>
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases
---- eclipse-3.1.0_fc/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases	2005-03-07 15:02:47.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases	2005-03-07 11:10:21.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases
+--- eclipse-3.1.0_fc/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases	2005-04-01 16:55:51.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases	2005-04-14 15:56:36.000000000 -0400
 @@ -21,4 +21,5 @@
  Sparc                                   # SUN
  x86 pentium i386 i486 i586 i686         # Intel
  s390                                    # IBM System 390
 +s390x                                   # IBM System 390 (64-bit)
  
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java
---- eclipse-3.1.0_fc/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java	2005-03-07 15:02:47.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java	2005-03-07 11:11:47.000000000 -0500
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java
+--- eclipse-3.1.0_fc/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java	2005-04-01 16:55:27.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java	2005-04-14 15:56:36.000000000 -0400
 @@ -118,6 +118,22 @@
  	public static final String ARCH_IA64 = "ia64"; //$NON-NLS-1$
  
@@ -1160,53 +1081,16 @@
  	 * Constant string (value "win32") indicating the platform is running on a
  	 * machine using the Windows windowing system.
  	 */
-@@ -155,4 +171,4 @@
- 	 */
- 	public static final String WS_UNKNOWN = "unknown";//$NON-NLS-1$
- 
--}
-\ No newline at end of file
-+}
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.pde/about.mappings eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde/about.mappings
---- eclipse-3.1.0_fc/plugins/org.eclipse.pde/about.mappings	2005-03-07 15:02:50.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde/about.mappings	2005-03-07 11:56:02.000000000 -0500
-@@ -3,4 +3,4 @@
- # java.io.Properties file (ISO 8859-1 with "\" escapes)
- # This file does not need to be translated.
- 
--0= build@
-\ No newline at end of file
-+0= build@
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.pde.doc.user/about.mappings eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.doc.user/about.mappings
---- eclipse-3.1.0_fc/plugins/org.eclipse.pde.doc.user/about.mappings	2005-03-07 15:02:47.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.doc.user/about.mappings	2005-03-07 11:55:43.000000000 -0500
-@@ -3,4 +3,4 @@
- # java.io.Properties file (ISO 8859-1 with "\" escapes)
- # This file does not need to be translated.
- 
--0= build@
-\ No newline at end of file
-+0= build@
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.pde.source/about.mappings eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.source/about.mappings
---- eclipse-3.1.0_fc/plugins/org.eclipse.pde.source/about.mappings	2005-03-07 15:02:46.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.source/about.mappings	2005-03-07 11:55:15.000000000 -0500
-@@ -3,4 +3,4 @@
- # java.io.Properties file (ISO 8859-1 with "\" escapes)
- # This file does not need to be translated.
- 
--0= build@
-\ No newline at end of file
-+0= build@
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties
 --- eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties	2005-03-07 11:12:38.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties	2005-04-14 15:56:36.000000000 -0400
 @@ -0,0 +1,3 @@
 +#Sat Feb 19 15:09:12 EST 2005
 +bin.includes=fragment.xml,src/**
 +sourcePlugin=true
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml
 --- eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml	2005-03-07 11:13:06.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<?eclipse version="3.0"?>
@@ -1226,16 +1110,16 @@
 +  </extension>
 +
 +</fragment>
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties
 --- eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties	2005-03-07 11:12:44.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties	2005-04-14 15:56:36.000000000 -0400
 @@ -0,0 +1,3 @@
 +#Sat Feb 19 15:09:12 EST 2005
 +bin.includes=fragment.xml,src/**
 +sourcePlugin=true
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml
 --- eclipse-3.1.0_fc/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml	2005-03-07 11:13:28.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml	2005-04-14 15:56:36.000000000 -0400
 @@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<?eclipse version="3.0"?>
@@ -1255,36 +1139,16 @@
 +  </extension>
 +
 +</fragment>
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.platform/about.mappings eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform/about.mappings
---- eclipse-3.1.0_fc/plugins/org.eclipse.platform/about.mappings	2005-03-07 15:02:50.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform/about.mappings	2005-03-07 11:56:06.000000000 -0500
-@@ -3,4 +3,4 @@
- # java.io.Properties file (ISO 8859-1 with "\" escapes)
- # This file does not need to be translated.
- 
--0= build@
-\ No newline at end of file
-+0= build@
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.platform.source/about.mappings eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source/about.mappings
---- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source/about.mappings	2005-03-07 15:02:47.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source/about.mappings	2005-03-07 11:55:32.000000000 -0500
-@@ -3,4 +3,4 @@
- # java.io.Properties file (ISO 8859-1 with "\" escapes)
- # This file does not need to be translated.
- 
--0= build@
-\ No newline at end of file
-+0= build@
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties
 --- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties	2005-03-07 11:23:13.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties	2005-04-14 15:56:36.789485917 -0400
 @@ -0,0 +1,3 @@
 +#Sat Feb 19 15:09:09 EST 2005
 +bin.includes=fragment.xml,src/**
 +sourcePlugin=true
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml
 --- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml	2005-03-07 11:25:34.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml	2005-04-14 15:56:36.791485533 -0400
 @@ -0,0 +1,105 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project name="org.eclipse.platform.source.linux.gtk.s390" default="build.jars" basedir=".">
@@ -1391,9 +1255,9 @@
 +	</target>
 +
 +</project>
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml
 --- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml	2005-03-07 11:25:37.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml	2005-04-14 15:56:36.791485533 -0400
 @@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<?eclipse version="3.0"?>
@@ -1413,16 +1277,16 @@
 +  </extension>
 +
 +</fragment>
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties
 --- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties	2005-03-07 11:23:20.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties	2005-04-14 15:56:36.792485341 -0400
 @@ -0,0 +1,3 @@
 +#Sat Feb 19 15:09:09 EST 2005
 +bin.includes=fragment.xml,src/**
 +sourcePlugin=true
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml
 --- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml	2005-03-07 11:24:25.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml	2005-04-14 15:56:36.793485149 -0400
 @@ -0,0 +1,105 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project name="org.eclipse.platform.source.linux.gtk.s390x" default="build.jars" basedir=".">
@@ -1529,9 +1393,9 @@
 +	</target>
 +
 +</project>
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml
+diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml
 --- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml	2005-03-07 11:24:28.000000000 -0500
++++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml	2005-04-14 15:56:36.794484957 -0400
 @@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<?eclipse version="3.0"?>
@@ -1551,13 +1415,3 @@
 +  </extension>
 +
 +</fragment>
-diff -uNr eclipse-3.1.0_fc/plugins/org.eclipse.sdk/about.mappings eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.sdk/about.mappings
---- eclipse-3.1.0_fc/plugins/org.eclipse.sdk/about.mappings	2005-03-07 15:02:48.000000000 -0500
-+++ eclipse-3.1.0_fc.withs390ands390x/plugins/org.eclipse.sdk/about.mappings	2005-03-07 11:55:54.000000000 -0500
-@@ -3,4 +3,4 @@
- # java.io.Properties file (ISO 8859-1 with "\" escapes)
- # This file does not need to be translated.
- 
--0= build@
-\ No newline at end of file
-+0= build@


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- eclipse.spec	14 Apr 2005 01:52:09 -0000	1.102
+++ eclipse.spec	17 Apr 2005 04:26:54 -0000	1.103
@@ -3,14 +3,14 @@
 
 %define pkg_summary     An open, extensible IDE
 %define section         free
-%define swt_version     3123
+%define swt_version     3128
 %define eclipse_major   3
 %define eclipse_minor   1
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_micro   0
 %define eclipse_oldmajminmic  3.0.0
 %define libname         libswt3
-%define build_id        I20050219-1500
+%define build_id        I20050401-1645
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -22,11 +22,11 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:	0.M5.20
-License:        CPL
+Release:        0.M6.4
+License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0: 	http://download.eclipse.org/eclipse/downloads/drops/S-3.1M5a-200502191500/eclipse-sourceBuild-srcIncluded-3.1M5a.zip
+Source0: 	http://download.eclipse.org/eclipse/downloads/drops/S-3.1M6-200504011645/eclipse-sourceBuild-srcIncluded-3.1M6.zip
 Source1:        %{name}.script
 Source2:        %{name}.desktop
 Source3:        %{name}-16.gif
@@ -38,10 +38,11 @@
 Source9:        %{name}-platform.install
 Source10:       %{libname}-gtk2.install
 # this should be replaced with:
-# Source11:	%{name}-native-splash-3.1-M.png
+# Source11:	%{name}-native-splash-3.1.png
 # when Eclipse 3.1 comes out.
-Source11:	%{name}-native-splash-3.1-M-build.png
+Source11:	%{name}-native-splash-3.1-M6.png
 Source16:       %{name}-copy-platform.sh
+Source17:       %{name}-efj-wrapper.sh
 
 # Build libswt-mozilla
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
@@ -56,10 +57,6 @@
 Patch2:		%{name}-build.patch
 Patch4:		%{name}-libupdatebuild.patch
 Patch5:		%{name}-libupdatebuild2.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=85915
-Patch8:		%{name}-antsecuritymanager.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86571
-Patch9:		%{name}-pdebuildtarargs.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
 Patch10:	%{name}-icon.patch
 # Use installed mozilla libs and headers
@@ -77,9 +74,6 @@
 # Make find work.  See
 # https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736
 Patch16:	%{name}-find.patch
-# Bootstrap the build a la https://bugs.eclipse.org/bugs/show_bug.cgi?id=84914
-# ... the patch is a bit hacky at the moment
-Patch17:	%{name}-bootstrap.patch
 # Build swttools.jar
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
 Patch18: 	%{name}-swttools.patch
@@ -220,8 +214,6 @@
 %patch2 -p0
 %patch4 -p0
 %patch5 -p0
-%patch8 -p0
-%patch9 -p0
 %patch10 -p0
 %patch12 -p0
 %patch13 -p1
@@ -230,7 +222,6 @@
 %patch15 -p0
 popd
 %patch16 -p0
-%patch17 -p1
 pushd plugins/org.eclipse.swt.gtk64
 %patch18 -p0
 popd
@@ -246,9 +237,6 @@
 # Remove existing .sos
 find -name \*.so -exec rm "-f" "{}" ";"
 
-## Remove these as well
-#rm jdtcore.jar jdtCompilerAdapter.jar
-
 # Symlinks
 
 ## BEGIN ANT ##
@@ -360,27 +348,23 @@
 # 2. Build ecj with gcj-built ecj ("javac")
 # 3. Re-build ecj with output of 2.
 
-# Keep a backup
-cp -r plugins/org.eclipse.jdt.core plugins/org.eclipse.jdt.core.orig
+# Unzip the "stable compiler" source into a temp dir and build it.
+# Note: we don't want to build the CompilerAdapter.
+mkdir ecj-bootstrap-tmp
+unzip -qq -d ecj-bootstrap-tmp jdtcoresrc/src/jdtcore.zip
+rm -f ecj-bootstrap-tmp/org/eclipse/jdt/core/JDTCompilerAdapter.java
 
 # 1a. Build ecj with gcj -C
-pushd plugins/org.eclipse.jdt.core
-for f in `find batch -name '*.java' -or -name '*.properties'`; do
-    g=`echo $f | sed 's:^batch/:compiler/:' | xargs dirname`
-    [ -d $g ] || mkdir -p $g
-    cp -a $f $g
-done
-cd compiler
+pushd ecj-bootstrap-tmp
 for f in `find -name '*.java' | cut -c 3-`; do
     gcj -Wno-deprecated -C $f
 done
 find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\
-    xargs jar cf ../../../ecj-bootstrap.jar
+    xargs jar cf ../ecj-bootstrap.jar
 popd
 
 # Delete our modified jdtcore and restore the backup
-rm -rf plugins/org.eclipse.jdt.core
-mv plugins/org.eclipse.jdt.core.orig plugins/org.eclipse.jdt.core
+rm -rf ecj-bootstrap-tmp
 
 ## 1b. Natively-compile it
 #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
@@ -408,7 +392,7 @@
 rm ecj-bootstrap.jar
 
 # 3. Use this ecj to rebuild itself
-export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
+export CLASSPATH=`pwd`/jdtcoresrc/jdtcore.jar:$ORIGCLASSPATH
 ant -buildfile jdtcoresrc/compilejdtcore.xml
 
 ## Natively-compile it
@@ -421,7 +405,7 @@
 #rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so
 
 # Build the rest of Eclipse
-export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH
+export CLASSPATH=`pwd`/jdtcore.jar:$ORIGCLASSPATH
 #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj.db"
 ant \
   -Dnobootstrap=true \
@@ -429,9 +413,8 @@
   -Dlibsconfig=true
 
 pushd result
-# De-compress resulting tarball ... yeah, it's a .zip but actually a .tar.gz
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=79711
-tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.zip
+# De-compress resulting tarball
+tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz
 
 pushd eclipse
 
@@ -478,9 +461,9 @@
   done
 %endif
 
-# FIXME:  temporarily remove eclipseAdaptor.jar
+# FIXME:  temporarily remove org.eclipse.osgi_3.1.0.jar
 rm \
-  .%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}/eclipseAdaptor.jar.so
+  .%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar.so
 
 pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0
   gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
@@ -502,9 +485,8 @@
 
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=79711
 tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
-  result/org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.zip
+  result/org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz
 
 # Binaries, libraries, and natively-built shared libraries
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -530,38 +512,38 @@
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
 ln -sf %{_libdir}/%{name}/eclipse eclipse
 
-# JNI libraries
-cp -p plugins/org.eclipse.update.core.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libupdate.so \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/
-cp -p plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libcore_*.so \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/
-suff=
-%ifarch alpha ia64 ppc64 sparc64 x86_64
-suff=64
-%endif
-cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}/libswt*.so \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/
+## JNI libraries
+#cp -p plugins/org.eclipse.update.core.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libupdate.so \
+#  $RPM_BUILD_ROOT%{_libdir}/%{name}/
+#cp -p plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libcore_*.so \
+#  $RPM_BUILD_ROOT%{_libdir}/%{name}/
+#suff=
+#%ifarch alpha ia64 ppc64 sparc64 x86_64
+#suff=64
+#%endif
+#cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}/libswt*.so \
+#  $RPM_BUILD_ROOT%{_libdir}/%{name}/
 popd
 
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 chmod -R 755 eclipse *.so
 popd
 
-### begin libswt-gtk2 symlinks
-pushd $RPM_BUILD_ROOT%{_libdir}
-for base in awt-gtk mozilla-gtk atk-gtk gnome-gtk gtk pi-gtk; do
-  ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
-         libswt-${base}-%{swt_version}.so
-done
-popd
+#### begin libswt-gtk2 symlinks
+#pushd $RPM_BUILD_ROOT%{_libdir}
+#for base in awt-gtk mozilla-gtk atk-gtk gnome-gtk gtk pi-gtk; do
+#  ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
+#         libswt-${base}-%{swt_version}.so
+#done
+#popd
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 
 pushd $RPM_BUILD_ROOT%{_javadir}
 ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt.jar swt-gtk-%{version}.jar
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-mozilla.jar swt-mozilla-%{version}.jar
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-cairo.jar swt-cairo-%{version}.jar
+#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar
+#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-mozilla.jar swt-mozilla-%{version}.jar
+#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-cairo.jar swt-cairo-%{version}.jar
 popd
 ### end libswt-gtk2 symlinks
 
@@ -589,6 +571,11 @@
 ln -s ../icons/hicolor/48x48/apps/%{name}.png \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
+# install the efj wrapper script and change the Eclipse installation dir
+install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj
+sed --in-place "s:startup.jar:%{_datadir}/%{name}/startup.jar:" \
+  $RPM_BUILD_ROOT%{_bindir}/efj 
+
 # A sanity check.
 desktop-file-validate %{SOURCE2}
 
@@ -813,35 +800,31 @@
 
 %files -n %{libname}-gtk2 -f %{libname}-gtk2.install
 %defattr(0644,root,root,0755)
-%attr(0755,root,root) %{_libdir}/%{name}/libswt-gnome-gtk-*.so
-%attr(0755,root,root) %{_libdir}/%{name}/libswt-gtk-*.so
-%attr(0755,root,root) %{_libdir}/%{name}/libswt-pi-gtk-*.so
-%attr(0755,root,root) %{_libdir}/%{name}/libswt-atk-gtk-*.so
-%{_libdir}/%{name}/libswt-awt-gtk-*.so
-%{_libdir}/%{name}/libswt-mozilla-gtk-*.so
-%{_libdir}/libswt-*.so
+#%attr(0755,root,root) %{_libdir}/%{name}/libswt-gnome-gtk-*.so
+#%attr(0755,root,root) %{_libdir}/%{name}/libswt-gtk-*.so
+#%attr(0755,root,root) %{_libdir}/%{name}/libswt-pi-gtk-*.so
+#%attr(0755,root,root) %{_libdir}/%{name}/libswt-atk-gtk-*.so
+#%{_libdir}/%{name}/libswt-awt-gtk-*.so
+#%{_libdir}/%{name}/libswt-mozilla-gtk-*.so
+#%{_libdir}/libswt-*.so
 %{_javadir}/swt-gtk*.jar
-%{_javadir}/swt-pi-gtk*.jar
-%{_javadir}/swt-mozilla*.jar
-%{_javadir}/swt-cairo*.jar
+#%{_javadir}/swt-pi-gtk*.jar
+#%{_javadir}/swt-mozilla*.jar
+#%{_javadir}/swt-cairo*.jar
 # Native bits
 %{_libdir}/gcj-4.0.0/classmap.db.d/libswt3-gtk2.db
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt_3.1.0.jar.so
 %ifarch alpha ia64 ppc64 sparc64 x86_64
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt-pi.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt-mozilla.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt-cairo.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0.jar.so
 %else
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt-pi.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt-mozilla.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt-cairo.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0.jar.so
 %endif
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jface_3.1.0/jface.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jface_3.1.0.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jface.text_3.1.0/jfacetext.jar.so
 
 %files jdt -f %{name}-jdt.install
 %defattr(0644,root,root,0755)
+%attr(0755,root,root) %{_bindir}/efj
 # Native bits
 %{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-jdt.db
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_3.1.0/jdiui.jar.so
@@ -854,6 +837,7 @@
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_3.1.0/lib/launchingsupport.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0/jdt.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0/serialsupport.jar.so
+#%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.junit_3.8.1/junit.jar.so
 
 %files jdt-devel
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.source_3.*
@@ -886,8 +870,8 @@
 %{_datadir}/%{name}/icon.xpm
 %attr(0755,root,root) %{_datadir}/%{name}/buildscripts/copy-platform
 %attr(0755,root,root) %{_libdir}/%{name}/eclipse
-%attr(0755,root,root) %{_libdir}/%{name}/libcore*
-%attr(0755,root,root) %{_libdir}/%{name}/libupdate*
+#%attr(0755,root,root) %{_libdir}/%{name}/libcore*
+#%attr(0755,root,root) %{_libdir}/%{name}/libupdate*
 %{_datadir}/%{name}/eclipse
 %attr(0755,root,root) %{_bindir}/eclipse
 %{_datadir}/applications/*
@@ -899,19 +883,19 @@
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0/antsupport.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.compare_3.1.0/compare.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.0.0/boot.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.expressions_3.1.0/expressions.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.expressions_3.1.0.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_3.1.0/filebuffers.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0/resources.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.commands_3.1.0/commands.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.commands_3.1.0.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0/ant_tasks/resources-ant.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_3.1.0/runtime.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_3.1.0.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.variables_3.1.0/variables.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.debug.core_3.1.0/dtcore.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.debug.ui_3.1.0/dtui.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.base_3.0.0/helpbase.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.ui_3.0.0/helpui.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.appserver_3.0.0/appserver.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help_3.0.0/help.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.base_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.ui_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.appserver_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help_3.1.0.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_3.1.0/refcore.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_3.1.0/refui.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.0.0/services.jar.so
@@ -927,25 +911,25 @@
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.18.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.ui_3.1.0/teamui.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.text_3.1.0/text.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.browser_3.1.0/browser.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_3.0.0/cheatsheets.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0/console.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_3.1.0/externaltools.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.forms_3.0.0/forms.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.ide_3.1.0/ide.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.intro_3.1.0/intro.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui_3.1.0/ui.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_3.1.0/workbench.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.forms_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.ide_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.intro_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_3.1.0.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_3.1.0/compatibility.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_3.1.0/compatibility.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_3.1.0/compatibility.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_3.1.0/texteditor.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.editors_3.1.0/editors.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.presentations.r21_3.1.0/r21.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.views_3.1.0/views.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.core_3.0.0/updatecore.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_3.0.0/scheduler.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.ui_3.0.0/updateui.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.presentations.r21_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.views_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.core_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_3.1.0.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.ui_3.1.0.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/startup.jar.so
 # FIXME where should these go?
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.lucene_1.4.3/parser.jar.so
@@ -954,32 +938,31 @@
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0/lib/remoteAnt.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0/lib/antrunner.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0/lib/antsupportlib.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-digester.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-logging.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/jakarta-regexp-1.3.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/tomcat-util.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/servlets-manager.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/naming-common.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/naming-factory.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-beanutils.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/servlets-default.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-modeler.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/tomcat-coyote.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/jasper-compiler.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/catalina.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/jasper-runtime.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-logging-api.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/servlets-invoker.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/tomcatwrapper.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/mx4j-jmx.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/bootstrap.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/servlet.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-collections.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/servlets-common.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/naming-resources.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/tomcat-http11.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0/core.jar.so
-#%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0/eclipseAdaptor.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-digester.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-logging.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/jakarta-regexp-1.3.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcat-util.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-manager.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/naming-common.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/naming-factory.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-beanutils.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-default.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-modeler.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcat-coyote.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/jasper-compiler.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/catalina.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/jasper-runtime.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-logging-api.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-invoker.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcatwrapper.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/mx4j-jmx.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/bootstrap.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlet.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-collections.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-common.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/naming-resources.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcat-http11.jar.so
+#%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0/cvsssh2.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-stylebook.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-javamail.jar.so
@@ -993,9 +976,9 @@
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-xalan1.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-jai.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-starteam.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.0.0/webapp.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.0.0/WEB-INF/lib/jsp.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.0.0/WEB-INF/lib/servlets.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0/webapp.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0/WEB-INF/lib/jsp.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0/WEB-INF/lib/servlets.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.console_3.1.0/console.jar.so
 
 %files platform-devel
@@ -1004,6 +987,12 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Sat Apr 16 2005 Ben Konrath <bkonrath redhat com> 3.1.0_fc-0.M6.4
+- Update to 3.1M6.
+- Change bootstrap procedure to match the upstream method.
+- Remove patches that were fixed upstream. 
+- Add efj wrapper script.
+
 * Wed Apr 13 2005 Ben Konrath <bkonrath redhat com> 3.1.0_fc-0.M5.20
 - Fix the bootstrap patch (the ecj jar was missing some files).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	8 Mar 2005 03:35:45 -0000	1.21
+++ sources	17 Apr 2005 04:26:54 -0000	1.22
@@ -1,3 +1,2 @@
-6e54a6530cd2ca23f643c79fdc847d05  eclipse-sourceBuild-srcIncluded-3.1M5a.zip
-e8a25474a487bfc43bc171988d33bd65  eclipse-native-splash-3.1-M-build.png
-e938246ecd12c7c139fec749b8615425  eclipse-native-splash-3.1.png
+51d81345d2fa0e8aa0b455f6cf4c447f  eclipse-sourceBuild-srcIncluded-3.1M6.zip
+87f844d4b82a5abc5baac36025a7619d  eclipse-native-splash-3.1-M6.png


--- eclipse-antsecuritymanager.patch DELETED ---


--- eclipse-bootstrap.patch DELETED ---


--- eclipse-bootstrapbuild.patch DELETED ---


--- eclipse-nobootstrapbuild.patch DELETED ---


--- eclipse-pdebuildtarargs.patch DELETED ---


--- eclipse-swtbuild.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]