rpms/eclipse/devel 3.3-TODO.txt, 1.4, 1.5 eclipse.in, 1.3, 1.4 .cvsignore, 1.34, 1.35 eclipse-build.patch, 1.7, 1.8 eclipse-ecj-gcj.patch, 1.6, 1.7 eclipse-launcher-set-install-dir-and-shared-config.patch, 1.3, 1.4 eclipse-swttools.patch, 1.5, 1.6 eclipse-tomcat55-build.patch, 1.16, 1.17 eclipse-tomcat55.patch, 1.12, 1.13 eclipse.spec, 1.441, 1.442 sources, 1.46, 1.47 eclipse-ecj-square-bracket-classpath.patch, 1.6, NONE eclipse-launcher-addplatformtotildeeclipse.patch, 1.7, NONE eclipse-libupdatebuild.patch, 1.3, NONE eclipse-osgi-Java-1.7-profile.patch, 1.1, NONE eclipse-ppc64gre64.patch, 1.3, NONE eclipse-swt-firefox.2.patch, 1.3, NONE eclipse-swt-firefox.patch, 1.10, NONE eclipse-updatehomedir.patch, 1.11, NONE eclipse-usebuiltlauncher.patch, 1.6, NONE eclipse-webapp-tomcat55.patch, 1.7, NONE eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch, 1.3, NONE
Ben Konrath (bkonrath)
fedora-extras-commits at redhat.com
Wed Jun 27 15:57:34 UTC 2007
Author: bkonrath
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28461
Modified Files:
.cvsignore eclipse-build.patch eclipse-ecj-gcj.patch
eclipse-launcher-set-install-dir-and-shared-config.patch
eclipse-swttools.patch eclipse-tomcat55-build.patch
eclipse-tomcat55.patch eclipse.spec sources
Added Files:
3.3-TODO.txt eclipse.in
Removed Files:
eclipse-ecj-square-bracket-classpath.patch
eclipse-launcher-addplatformtotildeeclipse.patch
eclipse-libupdatebuild.patch
eclipse-osgi-Java-1.7-profile.patch eclipse-ppc64gre64.patch
eclipse-swt-firefox.2.patch eclipse-swt-firefox.patch
eclipse-updatehomedir.patch eclipse-usebuiltlauncher.patch
eclipse-webapp-tomcat55.patch
eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch
Log Message:
Restore Eclipse 3.3
Index: 3.3-TODO.txt
===================================================================
RCS file: 3.3-TODO.txt
diff -N 3.3-TODO.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 3.3-TODO.txt 27 Jun 2007 15:56:56 -0000 1.5
@@ -0,0 +1,14 @@
+* enable ecj on ppc64, s390{,x}, sparc{,64}
+* junit 4.1
+* ant 1.7
+* deal with these:
+
+javax.servlet_2.4.0.v200704241052.jar
+javax.servlet.jsp_2.0.0.v200703221034.jar
+org.apache.commons.el_1.0.0.v200704241052.jar
+org.apache.commons.logging_1.0.4.v200701082340.jar
+org.apache.jasper_5.5.17.v200704241052.jar
+org.apache.lucene_1.9.1.v200703221049.jar
+org.apache.lucene.analysis_1.9.1.v200703221049.jar
+org.mortbay.jetty_5.1.11.v200701082340.jar
+
Index: eclipse.in
===================================================================
RCS file: eclipse.in
diff -N eclipse.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ eclipse.in 27 Jun 2007 15:56:57 -0000 1.4
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+exec @LIBDIR@/eclipse/eclipse \
+ --launcher.library @LIBDIR@/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux. at ECLIPSELIBSUFFIX@ \
+ -startup /usr/share/eclipse/startup.jar \
+ ${1+"$@"}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore 26 Jun 2007 16:01:53 -0000 1.34
+++ .cvsignore 27 Jun 2007 15:56:56 -0000 1.35
@@ -1,4 +1,3 @@
-icu4jsrc_3_4_5.jar
eclipse-fileinitializerapp.tar.bz2
-eclipse-sourceBuild-srcIncluded-3.2.2.zip
-eclipse-fedora-splash-3.2.2.png
+eclipse-sourceBuild-srcIncluded-3.3RC4.zip
+eclipse-fedora-splash-3.3.0.png
eclipse-build.patch:
Index: eclipse-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-build.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-build.patch 26 Jun 2007 16:01:53 -0000 1.7
+++ eclipse-build.patch 27 Jun 2007 15:56:56 -0000 1.8
@@ -5,20 +5,17 @@
diff -u -r1.9 build.xml
--- build.xml 11 May 2006 20:51:39 -0000 1.9
+++ build.xml 26 May 2006 23:06:38 -0000
-@@ -95,6 +95,18 @@
+@@ -95,6 +95,15 @@
<arg line="build.sh" />
</exec>
<move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/" />
+
-+ <delete dir="${launcherlibs}/library"/>
-+
-+ <!-- Build JNI libs -->
-+ <!-- liblocalfile -->
++ <!-- build liblocalfile -->
+ <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true"/>
+ <move file="plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so"
+ todir="plugins/org.eclipse.core.filesystem.linux.${installArch}/os/linux/${installArch}">
-+ </move>
-+ <!-- and libupdate -->
++ </move>
++ <!-- build libupdate -->
+ <ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
+
</target>
eclipse-ecj-gcj.patch:
Index: eclipse-ecj-gcj.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-ecj-gcj.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-ecj-gcj.patch 26 Jun 2007 16:01:53 -0000 1.6
+++ eclipse-ecj-gcj.patch 27 Jun 2007 15:56:56 -0000 1.7
@@ -367,7 +367,7 @@
+ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
+ }
+ this.destinationPath = arg;
-+ this.generatePackagesStructure = true;
++ //this.generatePackagesStructure = true;
+ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
+ classpath = getArgument(currentArg);
+ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
eclipse-launcher-set-install-dir-and-shared-config.patch:
Index: eclipse-launcher-set-install-dir-and-shared-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-launcher-set-install-dir-and-shared-config.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-launcher-set-install-dir-and-shared-config.patch 26 Jun 2007 16:01:53 -0000 1.3
+++ eclipse-launcher-set-install-dir-and-shared-config.patch 27 Jun 2007 15:56:56 -0000 1.4
@@ -1,121 +1,23 @@
-### Eclipse Workspace Patch 1.0
-#P platform-launcher
-Index: library/eclipseConfig.c
-===================================================================
-RCS file: /cvsroot/eclipse/platform-launcher/library/eclipseConfig.c,v
-retrieving revision 1.11
-diff -u -r1.11 eclipseConfig.c
---- library/eclipseConfig.c 15 Apr 2005 19:17:10 -0000 1.11
-+++ library/eclipseConfig.c 25 Oct 2006 22:10:20 -0000
-@@ -30,8 +30,11 @@
-
- #endif
-
--int readConfigFile(_TCHAR* program, _TCHAR* arg0, int *argc, _TCHAR ***argv)
-+/* installDir must end in path separator */
-+int readConfigFile(_TCHAR* installDir, _TCHAR* arg0, int *argc, _TCHAR ***argv)
- {
-+ _TCHAR* temp;
-+ _TCHAR* programName;
- _TCHAR* config_file = NULL;
- _TCHAR buffer[1024];
- _TCHAR argument[1024];
-@@ -39,11 +42,20 @@
- int maxArgs = 128;
- int index;
-
-- if (program == NULL || argc == NULL || argv == NULL) return -1;
--
-- /* Get a copy */
-- config_file = _tcsdup(program);
-+ if (installDir == NULL || argc == NULL || argv == NULL) return -1;
-
-+ /* Determine the name of the executable */
-+ temp = malloc( (_tcslen( arg0 ) + 1) * sizeof(_TCHAR) );
-+ _tcscpy( temp, arg0 );
-+ programName = _tcsrchr( temp, dirSeparator );
-+ if (programName == NULL)
-+ programName = temp;
-+ else
-+ programName++;
-+
-+ /* Get a copy */
-+ config_file = _tcsdup(installDir);
-+
- #ifdef _WIN32
- {
- /* Search for the extension .exe and replace it with .ini */
-@@ -57,8 +69,11 @@
- }
- #else
- /* Append the extension */
-- config_file = (char*)realloc(config_file, strlen(config_file) + 5);
-- strcat(config_file, ".ini");
-+ config_file = (char*)realloc(config_file, strlen(config_file) + strlen(programName) + 5);
-+ strcat(config_file, programName);
-+ free(temp);
-+ programName = NULL;
-+ strcat(config_file, ".ini");
- #endif
-
- /* Open the config file as a text file
Index: library/eclipse.c
===================================================================
-RCS file: /cvsroot/eclipse/platform-launcher/library/eclipse.c,v
-retrieving revision 1.71
-diff -u -r1.71 eclipse.c
---- library/eclipse.c 25 Apr 2006 14:31:50 -0000 1.71
-+++ library/eclipse.c 25 Oct 2006 22:10:20 -0000
-@@ -295,7 +295,8 @@
+RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/eclipse.c,v
+retrieving revision 1.20
+diff -u -r1.20 eclipse.c
+--- library/eclipse.c 8 Feb 2007 16:57:15 -0000 1.20
++++ library/eclipse.c 1 Mar 2007 03:44:19 -0000
+@@ -330,8 +330,9 @@
/* Define the required VM arguments (all platforms). */
- static _TCHAR* jar = _T_ECLIPSE("-jar");
--static _TCHAR** reqVMarg[] = { &jar, &jarFile, NULL };
-+static _TCHAR* sharedConfigurationDir = _T_ECLIPSE("-Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration");
-+static _TCHAR** reqVMarg[] = { &sharedConfigurationDir, &jar, &jarFile, NULL };
-
- /* Local methods */
- static int createUserArgs(int configArgc, _TCHAR **configArgv, int *argc, _TCHAR ***argv);
-@@ -387,8 +388,19 @@
- #endif
- }
-
-+ /* Find the directory where Eclipse is installed. */
-+ programDir = getProgramDir();
-+ if (programDir == NULL)
-+ {
-+ errorMsg = malloc( (_tcslen(homeMsg) + _tcslen(officialName) + 10) * sizeof(_TCHAR) );
-+ _stprintf( errorMsg, homeMsg, officialName );
-+ displayMessage( officialName, errorMsg );
-+ free( errorMsg );
-+ exit( 1 );
-+ }
-+
- /* Parse configuration file arguments */
-- if (isMainEclipse(argc, argv) && readConfigFile(program, argv[0], &configArgc, &configArgv) == 0)
-+ if (isMainEclipse(argc, argv) && readConfigFile(programDir, argv[0], &configArgc, &configArgv) == 0)
- {
- parseArgs (&configArgc, configArgv);
- }
-@@ -411,17 +423,6 @@
- /* Initialize the window system. */
- initWindowSystem( &argc, argv, (showSplashArg != NULL) );
-
-- /* Find the directory where the Eclipse program is installed. */
-- programDir = getProgramDir();
-- if (programDir == NULL)
-- {
-- errorMsg = malloc( (_tcslen(homeMsg) + _tcslen(officialName) + 10) * sizeof(_TCHAR) );
-- _stprintf( errorMsg, homeMsg, officialName );
-- displayMessage( officialName, errorMsg );
-- free( errorMsg );
-- exit( 1 );
-- }
--
- /* If the exit data option was given, set exit data */
- if (exitDataArg != NULL)
- {
-@@ -1078,19 +1079,12 @@
+ static _TCHAR* cp = NULL;
+-static _TCHAR* cpValue = NULL;
+-static _TCHAR** reqVMarg[] = { &cp, &cpValue, NULL }; /* required VM args */
++static _TCHAR* cpValue = NULL;
++static _TCHAR* sharedConfigurationDir = _T_ECLIPSE("-Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration");
++static _TCHAR** reqVMarg[] = { &sharedConfigurationDir, &cp, &cpValue, NULL }; /* required VM args */
+ static _TCHAR** userVMarg = NULL; /* user specific args for the Java VM */
+ static _TCHAR** eeVMarg = NULL; /* vm args specified in ee file */
+ static int nEEargs = 0;
+@@ -915,20 +916,12 @@
*/
_TCHAR* getProgramDir( )
{
@@ -134,25 +36,25 @@
-
- free( programDir );
- return NULL;
-+ programDir = malloc( (_tcslen( temp + 1 )) * sizeof(_TCHAR) );
-+ _tcscpy( programDir, temp );
-+ return programDir;
++ programDir = malloc( (_tcslen( temp + 1 )) * sizeof(_TCHAR) );
++ _tcscpy( programDir, temp );
++ return programDir;
}
-+
+ static _TCHAR* findStartupJar(){
Index: library/gtk/make_linux.mak
===================================================================
-RCS file: /cvsroot/eclipse/platform-launcher/library/gtk/make_linux.mak,v
-retrieving revision 1.11
-diff -u -r1.11 make_linux.mak
---- library/gtk/make_linux.mak 9 Mar 2006 19:01:05 -0000 1.11
-+++ library/gtk/make_linux.mak 25 Oct 2006 22:10:20 -0000
-@@ -27,7 +27,7 @@
- OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseConfig.o eclipseMozilla.o eclipseGtk.o
- EXEC = $(PROGRAM_OUTPUT)
- LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0
--CFLAGS = -O -s \
-+CFLAGS = -O -s -g \
+RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/gtk/make_linux.mak,v
+retrieving revision 1.10
+diff -u -r1.10 make_linux.mak
+--- library/gtk/make_linux.mak 7 Feb 2007 18:13:48 -0000 1.10
++++ library/gtk/make_linux.mak 1 Mar 2007 03:44:19 -0000
+@@ -43,7 +43,7 @@
+ DLL = $(PROGRAM_LIBRARY)
+ LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl
+ LFLAGS = -shared -fpic -Wl,--export-dynamic
+-CFLAGS = -O -s -Wall\
++CFLAGS = -O -s -Wall -g \
-fpic \
-DLINUX \
-DMOZILLA_FIX \
eclipse-swttools.patch:
Index: eclipse-swttools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-swttools.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-swttools.patch 26 Jun 2007 16:01:53 -0000 1.5
+++ eclipse-swttools.patch 27 Jun 2007 15:56:57 -0000 1.6
@@ -1,37 +1,14 @@
-Index: build.xml
-===================================================================
-RCS file: /home/eclipse/org.eclipse.swt.gtk.linux.x86_64/build.xml,v
-retrieving revision 1.3
-diff -u -r1.3 build.xml
---- build.xml 18 Apr 2005 20:27:37 -0000 1.3
-+++ build.xml 26 Apr 2005 19:13:30 -0000
-@@ -21,7 +21,6 @@
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-- <!--compile the jar in org.eclipse.swt.tools-->
- </target>
-
- <target name="build.update.jar" depends="init">
-@@ -200,8 +199,11 @@
+--- build.xml.orig 2007-02-22 10:14:59.000000000 -0500
++++ build.xml 2007-03-01 10:38:05.000000000 -0500
+@@ -228,6 +228,11 @@
</target>
<target name="build.cfiles" depends="build.jars">
-+ <!--compile the jar in org.eclipse.swt.tools-->
++ <!-- delete swttools.jar so that it will be compiled in the build.jars target -->
++ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
++ <!--compile swtools.jar in org.eclipse.swt.tools-->
+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
+
<!-- generate the C code from the (64 bit) SWT PI java classes -->
-- <!-- assumes the swt.jar has already been built -->
-+ <!-- assumes the swttools.jar has already been built -->
- <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
- <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
- <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cairo.Cairo"/><arg value="${basedir}/src/Eclipse SWT PI/cairo/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
-@@ -304,6 +306,8 @@
- <delete file="${plugin.destination}/${full.name}.jar"/>
- <delete file="${plugin.destination}/${full.name}.zip"/>
- <delete dir="${temp.folder}"/>
-+ <!-- delete swttools.jar so that it will be compiled in the build.jars target -->
-+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
- </target>
-
- <target name="refresh" depends="init" if="eclipse.running">
+ <!-- assumes the swt.jar has already been built -->
+ <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
eclipse-tomcat55-build.patch:
Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- eclipse-tomcat55-build.patch 26 Jun 2007 16:01:53 -0000 1.16
+++ eclipse-tomcat55-build.patch 27 Jun 2007 15:56:57 -0000 1.17
@@ -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.apache.ant/lib/ant-xalan1.jar"/>
- <pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
- <pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xslp.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- eclipse-tomcat55.patch 26 Jun 2007 16:01:53 -0000 1.12
+++ eclipse-tomcat55.patch 27 Jun 2007 15:56:57 -0000 1.13
@@ -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,
@@ -860,5 +860,5 @@
+ org.apache.tomcat.util.threads;x-internal:=true,
+ org.eclipse.tomcat.internal;x-internal:=true,
+ org.eclipse.tomcat.internal;x-internal:=true,
- org.eclipse.tomcat.internal.extensions;x-internal:=true
+ org.eclipse.tomcat.internal.extensions
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- eclipse.spec 26 Jun 2007 18:02:29 -0000 1.441
+++ eclipse.spec 27 Jun 2007 15:56:57 -0000 1.442
@@ -2,10 +2,11 @@
%define gcj_support 1
%define tomcatsharedir %{_datadir}/tomcat5
+%define tomcatlibdir %{_var}/lib/tomcat5
%define eclipse_major 3
-%define eclipse_minor 2
+%define eclipse_minor 3
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro 2
+%define eclipse_micro 0
%define libname libswt3
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -18,16 +19,14 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 15%{?dist}
+Release: 0.2.RC4%{?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/R-3.2.2-200702121330/eclipse-sourceBuild-srcIncluded-3.2.2.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC4-200706081718/eclipse-sourceBuild-srcIncluded-3.3RC4.zip
+Source1: %{name}-fedora-splash-3.3.0.png
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
-Source7: ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.5/icu4jsrc_3_4_5.jar
-Source11: %{name}-fedora-splash-3.2.2.png
+Source3: eclipse.in
Source16: %{name}-copy-platform.sh
Source17: efj.sh.in
Source18: ecj.sh.in
@@ -39,19 +38,11 @@
# (generated 2006-11-01 18:48 UTC)
Source20: %{name}-fileinitializerapp.tar.bz2
-# Build liblocalfile and libupdate JNI libs in the main SDK build.xml
-Patch0: %{name}-build.patch
-# We need this because icu4j's Eclipse bits are dependent upon Eclipse
-# but we don't want the icu4j RPM needing Eclipse to build
-Patch1: %{name}-icu4j-build-files.patch
# These two patches need to go upstream
-Patch2: %{name}-libupdatebuild.patch
Patch3: %{name}-libupdatebuild2.patch
# Build swttools.jar
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
Patch4: %{name}-swttools.patch
-# This needs to go upstream
-Patch11: %{name}-usebuiltlauncher.patch
# This does two things:
# 1. allows the launcher to be in /usr/bin and
# 2. ensures that the OSGi configuration directory
@@ -66,44 +57,13 @@
# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
# This needs to be submitted upstream
Patch15: %{name}-pde.build-add-package-build.patch
+# FIXME: Should we ship tomcat plugins with 3.3?
# This tomcat stuff will change when they move to the equinox jetty provider
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
Patch6: %{name}-tomcat55.patch
Patch7: %{name}-tomcat55-build.patch
-Patch8: %{name}-webapp-tomcat55.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630
-Patch5: %{name}-updatehomedir.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=161996
-Patch9: %{name}-ecj-square-bracket-classpath.patch
# Use ecj for gcj
Patch17: %{name}-ecj-gcj.patch
-# Build against firefox:
-# - fix swt profile include path
-# - don't compile the mozilla 1.7 / firefox profile library -- build it inline
-# - don't use symbols not in our firefox builds
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=161310
-# FIXME: these can probably go away >= 3.3M4
-# Note: I made this patch from within Eclipse and then did the following to
-# it due to spaces in the paths:
-# sed --in-place "s/Eclipse\ SWT\ Mozilla/Eclipse_SWT_Mozilla/g" eclipse-swt-firefox.patch
-# sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-swt-firefox.patch
-Patch18: %{name}-swt-firefox.patch
-Patch19: %{name}-swt-firefox.2.patch
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=209393
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853
-Patch20: %{name}-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch
-# This is already upstream in 3.3 builds. It *may* get into 3.2.2.
-Patch21: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
-# Add ppc64 to the list of arches with gre64.conf
-# part of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=207016
-Patch22: %{name}-ppc64gre64.patch
-# This patch allowed us to remove
-# /usr/share/eclipse/configuration/org.eclipse.update/platform.xml -- which
-# fixed a number of update-related bugs -- in an FC6 update.
-# We can remove this patch for Fedora 8.
-Patch23: %{name}-launcher-addplatformtotildeeclipse.patch
-Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch
-Patch25: %{name}-osgi-Java-1.7-profile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
@@ -121,13 +81,14 @@
BuildRequires: mesa-libGLU-devel
BuildRequires: cairo >= 1.0
BuildRequires: unzip
+BuildRequires: icu4j-eclipse >= 3.6.1
BuildRequires: java-javadoc
BuildRequires: desktop-file-utils
%if %{gcj_support}
-BuildRequires: gcc-java >= 4.0.2
+BuildRequires: gcc-java >= 4.1.2
BuildRequires: java-gcj-compat-devel >= 1.0.64
%else
-BuildRequires: java-devel >= 1.4.2
+BuildRequires: java-devel >= 1.5.0
%endif
# Need to investigate why we don't build ant-apache-bsf or ant-commons-net in
@@ -135,7 +96,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.31
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
@@ -192,9 +153,10 @@
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.2.2.v3236.jar
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3345f.jar
Requires(post): %{libname}-gtk2 = %{epoch}:%{version}-%{release}
Requires(postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release}
+Requires: icu4j-eclipse > = 3.6.1
%if %{gcj_support}
Requires: libgcj >= 4.0.2
Requires(post): java-gcj-compat >= 1.0.64
@@ -216,6 +178,33 @@
%description rcp-sdk
Source for Eclipse Rich Client Platform for use within Eclipse.
+%package cvs-client
+Summary: Eclipse CVS Client
+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}
+%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 CVS Client
+
+%package cvs-client-sdk
+Summary: Eclipse Rich Client Platform SDK
+Group: Text Editors/Integrated Development Environments (IDE)
+Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release}
+Requires(post): %{name}-cvs-client = %{epoch}:%{version}-%{release}
+Requires(postun): %{name}-cvs-client = %{epoch}:%{version}-%{release}
+
+%description cvs-client-sdk
+Source for Eclipse CVS Client for use within Eclipse.
+
%package platform
Summary: Eclipse platform common files
Group: Text Editors/Integrated Development Environments (IDE)
@@ -225,7 +214,7 @@
%endif
Requires: %{name}-rcp = %{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.2.2.v3236.jar
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3345f.jar
Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release}
Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release}
# Need to investigate why we don't build ant-apache-bsf or ant-commons-net in
@@ -239,7 +228,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.31
Requires: lucene, lucene-devel
Requires: regexp
@@ -370,16 +359,13 @@
%prep
%setup -q -c
-%patch0 -p0
sed --in-place "s/java5.home/java.home/" build.xml
-%patch2 -p0
%patch3 -p0
# FIXME: investigate why we are pushd'ing here
# Build swttools.jar
pushd plugins/org.eclipse.swt.gtk.linux.x86_64
%patch4 -p0
popd
-%patch5 -p0
# tomcat patches
pushd plugins/org.eclipse.tomcat
@@ -391,41 +377,20 @@
plugins/org.eclipse.tomcat/build.xml \
plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF \
assemble.*.xml
-pushd plugins/org.eclipse.help.webapp
-%patch8 -p0
-popd
pushd plugins/org.eclipse.jdt.core
-%patch9 -p0
%patch17 -p0
popd
-%patch11 -p0
-# Because the launcher source is zipped up, we need to unzip, patch, and re-pack
-# FIXME: figure out why we need to patch and sed twice and fix upstream
-mkdir launchertmp
-unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip
-pushd launchertmp
+# launcher patches
+rm plugins/org.eclipse.platform/launchersrc.zip
+pushd features/org.eclipse.equinox.executable
%patch12 -p0
-%patch22 -p0
-%patch23 -p0
# put the configuration directory in an arch-specific location
sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c
# make the eclipse binary relocatable
sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
-zip -q -9 -r ../launchersrc.zip *
-popd
-mv launchersrc.zip plugins/org.eclipse.platform
-rm -rf launchertmp
-pushd features/org.eclipse.platform.launchers
-%patch12 -p0
-%patch22 -p0
-%patch23 -p0
-
-# put the configuration directory in an arch-specific location
-sed --in-place "s:/usr/lib/eclipse:%{_libdir}/%{name}:" library/eclipse.c
-# make the eclipse binary relocatable
-sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
+zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
popd
# use our system-installed javadocs
@@ -437,6 +402,7 @@
sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadocs/java|" \
plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
plugins/org.eclipse.pde.doc.user/pdeOptions
+
%patch14 -p0
pushd plugins/org.eclipse.pde.build
@@ -444,42 +410,8 @@
sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" templates/package-build/build.properties
popd
-# Build against our firefox packages
-pushd plugins/org.eclipse.swt
-mv "Eclipse SWT Mozilla" Eclipse_SWT_Mozilla
-mv "Eclipse SWT PI" Eclipse_SWT_PI
-%patch18
-mv Eclipse_SWT_Mozilla "Eclipse SWT Mozilla"
-mv Eclipse_SWT_PI "Eclipse SWT PI"
-popd
-pushd plugins/org.eclipse.swt.tools
-mv "JNI Generation" JNI_Generation
-%patch19
-mv JNI_Generation "JNI Generation"
-popd
-
-# workaround for GNU XML bug when parsing plugin.xml
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853
-pushd plugins/org.eclipse.pde.core
-%patch20
-popd
-
-# customcallbacks fixes. They are upstream already.
-pushd plugins/org.eclipse.platform.doc.isv
-%patch21 -p0
-popd
-pushd plugins/org.eclipse.platform.doc.user
-%patch21 -p0
-popd
-
-pushd plugins/org.eclipse.osgi
-%patch25 -p0
-popd
-
# Splashscreen
-pushd plugins/org.eclipse.platform
-cp %{SOURCE11} splash.bmp
-popd
+cp %{SOURCE1} plugins/org.eclipse.platform/splash.bmp
# FIXME this should be patched upstream with a flag to turn on and off
# all output should be directed to stdout
@@ -492,102 +424,59 @@
# Symlinks
## BEGIN ANT ##
-rm plugins/org.apache.ant/lib/ant-antlr.jar
-rm plugins/org.apache.ant/lib/ant-antlrsrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-bcel.jar
-rm plugins/org.apache.ant/lib/ant-apache-bcelsrc.zip
-#rm plugins/org.apache.ant/lib/ant-apache-bsf.jar
-#rm plugins/org.apache.ant/lib/ant-apache-bsfsrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-log4j.jar
-rm plugins/org.apache.ant/lib/ant-apache-log4jsrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-oro.jar
-rm plugins/org.apache.ant/lib/ant-apache-orosrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-regexp.jar
-rm plugins/org.apache.ant/lib/ant-apache-regexpsrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-resolver.jar
-rm plugins/org.apache.ant/lib/ant-apache-resolversrc.zip
-rm plugins/org.apache.ant/lib/ant-commons-logging.jar
-rm plugins/org.apache.ant/lib/ant-commons-loggingsrc.zip
-rm plugins/org.apache.ant/lib/ant-commons-net.jar
-rm plugins/org.apache.ant/lib/ant-commons-netsrc.zip
-rm plugins/org.apache.ant/lib/ant-icontract.jar
-rm plugins/org.apache.ant/lib/ant-icontractsrc.zip
-rm plugins/org.apache.ant/lib/ant-jai.jar
-rm plugins/org.apache.ant/lib/ant-jaisrc.zip
-rm plugins/org.apache.ant/lib/ant.jar
-rm plugins/org.apache.ant/lib/antsrc.zip
-rm plugins/org.apache.ant/lib/ant-javamail.jar
-rm plugins/org.apache.ant/lib/ant-javamailsrc.zip
-rm plugins/org.apache.ant/lib/ant-jdepend.jar
-rm plugins/org.apache.ant/lib/ant-jdependsrc.zip
-rm plugins/org.apache.ant/lib/ant-jmf.jar
-rm plugins/org.apache.ant/lib/ant-jmfsrc.zip
-rm plugins/org.apache.ant/lib/ant-jsch.jar
-rm plugins/org.apache.ant/lib/ant-jschsrc.zip
-rm plugins/org.apache.ant/lib/ant-junit.jar
-rm plugins/org.apache.ant/lib/ant-junitsrc.zip
-rm plugins/org.apache.ant/lib/ant-launcher.jar
-rm plugins/org.apache.ant/lib/ant-launchersrc.zip
-rm plugins/org.apache.ant/lib/ant-netrexx.jar
-rm plugins/org.apache.ant/lib/ant-netrexxsrc.zip
-rm plugins/org.apache.ant/lib/ant-nodeps.jar
-rm plugins/org.apache.ant/lib/ant-nodepssrc.zip
-rm plugins/org.apache.ant/lib/ant-starteam.jar
-rm plugins/org.apache.ant/lib/ant-starteamsrc.zip
-rm plugins/org.apache.ant/lib/ant-stylebook.jar
-rm plugins/org.apache.ant/lib/ant-stylebooksrc.zip
-rm plugins/org.apache.ant/lib/ant-swing.jar
-rm plugins/org.apache.ant/lib/ant-swingsrc.zip
-rm plugins/org.apache.ant/lib/ant-trax.jar
-rm plugins/org.apache.ant/lib/ant-traxsrc.zip
-rm plugins/org.apache.ant/lib/ant-vaj.jar
-rm plugins/org.apache.ant/lib/ant-vajsrc.zip
-rm plugins/org.apache.ant/lib/ant-weblogic.jar
-rm plugins/org.apache.ant/lib/ant-weblogicsrc.zip
-rm plugins/org.apache.ant/lib/ant-xalan1.jar
-rm plugins/org.apache.ant/lib/ant-xalan1src.zip
-rm plugins/org.apache.ant/lib/ant-xslp.jar
-rm plugins/org.apache.ant/lib/ant-xslpsrc.zip
+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/lib/ant-antlr.jar
-ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant/lib/ant-apache-bcel.jar
-#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant/lib/ant-apache-bsf.jar
-ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant/lib/ant-apache-log4j.jar
-ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant/lib/ant-apache-oro.jar
-ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant/lib/ant-apache-regexp.jar
-ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant/lib/ant-apache-resolver.jar
-ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/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/lib/ant-commons-net.jar
-#ln -s %{_javadir}/ant/ant-icontract.jar plugins/org.apache.ant/lib/ant-icontract.jar
-#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant/lib/ant-jai.jar
-ln -s %{_javadir}/ant.jar plugins/org.apache.ant/lib/ant.jar
-ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant/lib/ant-javamail.jar
-ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant/lib/ant-jdepend.jar
-#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant/lib/ant-jmf.jar
-ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant/lib/ant-jsch.jar
-ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant/lib/ant-junit.jar
-ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant/lib/ant-launcher.jar
-#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant/lib/ant-netrexx.jar
-ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant/lib/ant-nodeps.jar
-#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant/lib/ant-starteam.jar
-#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant/lib/ant-stylebook.jar
-ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant/lib/ant-swing.jar
-ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
-#ln -s %{_javadir}/ant/ant-vaj.jar plugins/org.apache.ant/lib/ant-vaj.jar
-#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant/lib/ant-weblogic.jar
-#ln -s %{_javadir}/ant/ant-xalan1.jar plugins/org.apache.ant/lib/ant-xalan1.jar
-#ln -s %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant/lib/ant-xslp.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 LUCENE ##
-rm plugins/org.apache.lucene/lucene-1.4.3.jar
-rm plugins/org.apache.lucene/lucene-1.4.3-src.zip
-ln -s %{_usr}/src/lucene/lucene-1.4.3.jar plugins/org.apache.lucene/lucene-1.4.3-src.zip
-ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar
-# END LUCENE ##
-
## BEGIN TOMCAT ##
rm plugins/org.eclipse.tomcat/commons-beanutils.jar
rm plugins/org.eclipse.tomcat/commons-collections.jar
@@ -643,7 +532,8 @@
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib servletapi5
## END TOMCAT ##
-build-jar-repository -s -p plugins/org.junit 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
@@ -651,7 +541,6 @@
sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
popd
-
# FIXME: figure out what's going on with build.index.
find plugins -type f -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
@@ -666,66 +555,42 @@
assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
features/org.eclipse.rcp/build.xml
-## Nasty hack to get suppport for ppc64, s390{,x} and sparc{,64}
-%patch24 -p0
-# there is only partial support for ppc64 in 3.2 so we have to remove this
-# partial support to get the replacemnt hack to work
-find -name \*ppc64\* | xargs rm -r
-# remove ppc64 support from features/org.eclipse.platform.source/feature.xml
-# replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
-find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \;
-# remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq
-sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml
-# replace final occurances with an existing arch
-sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
-# Move all of the ia64 directories to ppc64 or s390{,x} or sparc{,64} dirs and replace
-# the ia64 strings with ppc64 or s390(x)
-%ifarch ppc64 s390 s390x sparc sparc64
- for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do
- mv $f $(echo $f | sed "s/ia64/%{_arch}/")
- done
- find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64_32/@eye-eh-64_32@/g" "{}" \;
- find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64/%{_arch}/g" "{}" \;
- find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
-%endif
-
-# link to the jsch jar
-rm baseLocation/plugins/com.jcraft.jsch_0.1.28.jar
-ln -s %{_javadir}/jsch.jar baseLocation/plugins/com.jcraft.jsch_0.1.28.jar
+# 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
-# set the icu4j plugins for building
-pushd baseLocation/plugins
-rm com.ibm.icu.base_3.4.5.20061213.jar \
- com.ibm.icu_3.4.5.20061213.jar \
- com.ibm.icu.base.source_3.4.5.20061213/src/com.ibm.icu.base_3.4.5.20061213/src.zip \
- com.ibm.icu.source_3.4.5.20061213/src/com.ibm.icu_3.4.5.20061213/src.zip
-mkdir -p icu4j-build-temp
-
-pushd icu4j-build-temp
-unzip -qq %{SOURCE7}
-sed --in-place "s/ .*bootclasspath=.*//g" build.xml
-ant eclipseProjects
-popd
+# 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
-mkdir -p icu4j-build
-mv icu4j-build-temp/eclipseProjects/com.ibm.icu icu4j-build
-mv icu4j-build-temp/eclipseProjects/com.ibm.icu.base icu4j-build
-rm -r icu4j-build-temp
-
-# add build.xml patches
-pushd icu4j-build
-%patch1 -p1
-popd
+# link to the jsch jar
+rm plugins/com.jcraft.jsch_0.1.31.jar
+ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
-popd
+# link to the icu4j stuff
+rm plugins/com.ibm.icu_3.6.1.v20070417.jar
+ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_3.6.1.v20070417.jar plugins/com.ibm.icu_3.6.1.v20070417.jar
# delete included jars
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662
rm plugins/org.eclipse.swt.win32.win32.x86/swt.jar \
plugins/org.eclipse.swt/extra_jars/exceptions.jar \
plugins/org.eclipse.swt.tools/swttools.jar \
- features/org.eclipse.platform.launchers/bin/startup.jar \
- plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_*.jar
+ plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
+ plugins/org.eclipse.osgi/osgi/osgi.core.jar \
+ plugins/org.eclipse.osgi/supplement/osgi/osgi.jar
# make sure there are no jars left
JARS=""
@@ -741,94 +606,31 @@
tar jxf %{SOURCE20}
-sed --in-place "s/setErrorMessage(ee./\/\/ setErrorMessage(ee./g" plugins/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java
-
-
%build
ORIGCLASSPATH=$CLASSPATH
-# Finish the icu4j build
-pushd baseLocation/plugins
+# Bootstrapping:
+# 1. Build ecj with gcj-built ecj ("javac")
+# 2. Re-build ecj with output of 1.
-# Build the icu.base plugin
-zipfile=$PWD/com.ibm.icu.base.source_3.4.5.20061213/src/com.ibm.icu.base_3.4.5.20061213/src.zip
-pushd icu4j-build/com.ibm.icu.base/src
-find -name \*.java | xargs touch --date=1/1/1980
-zip -X -9 -r $zipfile . -i \*.java
-popd
-pushd icu4j-build/com.ibm.icu.base
-ant build.update.jar
-popd
-mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar com.ibm.icu.base_3.4.5.20061213.jar
-
-# Build the icu plugin
-zipfile=$PWD/com.ibm.icu.source_3.4.5.20061213/src/com.ibm.icu_3.4.5.20061213/src.zip
-pushd icu4j-build/com.ibm.icu/src
-find -name \*.java | xargs touch --date=1/1/1980
-zip -X -9 -r $zipfile . -i \*.java
-popd
-pushd icu4j-build/com.ibm.icu
-ant build.update.jar
-popd
-mv icu4j-build/com.ibm.icu/com.ibm.icu_3.4.5.jar com.ibm.icu_3.4.5.20061213.jar
-
-popd
-
-# Bootstrapping is 3 parts:
-# 1. Build ecj with gcj -C -- only necessary until gcjx/ecj lands in gcc
-# 2. Build ecj with gcj-built ecj ("javac")
-# 3. Re-build ecj with output of 2.
-
-%if %{gcj_support}
- # 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/ecj.zip
- rm -f ecj-bootstrap-tmp/org/eclipse/jdt/core/JDTCompilerAdapter.java
-
- # 1a. Build ecj with gcj -C
- pushd ecj-bootstrap-tmp
- for f in `find -name '*.java' | cut -c 3- | LC_ALL=C sort`; do
- gcj -Wno-deprecated -C $f
- done
- find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\
- xargs jar cf ../ecj-bootstrap.jar
- popd
-
- # Delete our modified ecj and restore the backup
- rm -rf ecj-bootstrap-tmp
-
- # 1b. Natively-compile it
- gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
- -o ecj-bootstrap.jar.so ecj-bootstrap.jar
-
- gcj-dbtool -n ecj-bootstrap.db 30000
- gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so}
-
- # 2a. Build ecj
- export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH
- export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
-%endif
-ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
+# 1a. compile ecj with javac
+ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
%if %{gcj_support}
- # 2b. Natively-compile ecj
+ # 1b. Natively-compile ecj
gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar
gcj-dbtool -n jdtcoresrc/ecj.db 30000
gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so}
- # Remove our gcj-built ecj
- rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
-
- # To enSURE we're not using any pre-compiled ecj on the build system, set this
+ # To ensure we're not using any pre-compiled ecj on the build system, set this
export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
%endif
-# 3. Use this ecj to rebuild itself
+# 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
@@ -848,9 +650,9 @@
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
+## Build the FileInitializer application
SDK=$(cd eclipse && pwd)
PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build | sed 's/org.eclipse.pde.build_//')
pushd equinox-incubator
@@ -862,9 +664,10 @@
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 \
+LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
+java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-Duser.home=$homedir \
+ org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-Dtype=plugin \
-Did=org.eclipse.equinox.initializer \
@@ -874,13 +677,12 @@
-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 \
+java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-Duser.home=$homedir \
- -application org.eclipse.ant.core.antRunner \
+ org.eclipse.core.launcher.Main \
+ -debug -application org.eclipse.ant.core.antRunner \
-f build.xml build.update.jar
popd
-
popd
%install
@@ -901,8 +703,14 @@
# Explode the resulting SDK tarball
tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
-# The FileInitializer app isn't part of the SDK (yet?) but we want it to be
-# around for other RPMs
+# Add a compatibility symlink to startup.jar
+pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
+LAUNCHERNAME=$(ls plugins | grep equinox.launcher_)
+ln -s plugins/$LAUNCHERNAME startup.jar
+popd
+
+## 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
@@ -932,10 +740,6 @@
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_$UPDATECORELINUXVERSION \
$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.4.5.20061213.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu.source_3.4.5.20061213 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-
# FIXME: there is a problem with gjdoc generating different HTML on different
# architectures.
PLATFORMDOCISVVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep platform.doc.isv_ | sed 's/org.eclipse.platform.doc.isv_//')
@@ -994,14 +798,24 @@
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/configuration $RPM_BUILD_ROOT%{_libdir}/%{name}
rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.update
rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.core.runtime
+rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.app
# Set config.ini for the platform; no benefit to having it be sdk
sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \
$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
-# Install the Eclipse binary
+# Install the launcher so
+LAUNCHERFRAGVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins | grep equinox.launcher.gtk.linux.%{eclipse_arch}_ | sed "s/.*equinox.launcher.gtk.linux.*_//")
+cp launchertmp/library/gtk/eclipse_*.so \
+$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}_$LAUNCHERFRAGVERSION
+
+# Install the Eclipse binary wrapper
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse $RPM_BUILD_ROOT%{_libdir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse $RPM_BUILD_ROOT%{_bindir}/%{name}
+cp %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/eclipse
+sed --in-place "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_bindir}/eclipse
+ECLIPSELIBSUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux*/*.so | sed "s/.*.launcher.gtk.linux.//")
+sed --in-place "s|@ECLIPSELIBSUFFIX@|$ECLIPSELIBSUFFIX|" $RPM_BUILD_ROOT%{_bindir}/eclipse
# Ensure the shared libraries have the correct permissions
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -1063,7 +877,6 @@
$RPM_BUILD_ROOT%{_datadir}/pixmaps
%ifarch %{ix86} x86_64
# Remove unused icon.xpm
-# This should be fixed in 3.3.
# see https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm
%endif
@@ -1114,81 +927,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
@@ -1226,87 +1017,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
-
-# Ensure that the zip files are the same across all builds.
-# This is needed to make these package multilib compatible.
-# FIXME: this needs to be re-written as a separate program
-# warning: big hack!
-mkdir -p ${RPM_BUILD_ROOT}/tmp
-for zip in `find ${RPM_BUILD_ROOT}%{_datadir}/%{name} -type f -name \*.zip -o -type f -name \*.jar`; do
- # unpack every zip, set the date of the files and directories and repack the zip
- ZIPNAME=`basename $zip`
- TMPDIR=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME.tmpdir.XXXXXXXXXX`
- ZIPDIR=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME.zipdir.XXXXXXXXXX`
-
- pushd $TMPDIR
- unzip -qq -o $zip
- rm -f $zip
-
- # check if there are jars or zips inside the zip or jar
- zipsinside=`find $TMPDIR -type f -name \*.zip -o -name \*.jar`
- if [ -n "$zipsinside" ]; then
- for zip2 in $zipsinside; do
- # unpack every zip, set the date of the files and directories and repack the zip
- ZIPNAME2=`basename $zip2`
- TMPDIR2=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME2.tmpdir.XXXXXXXXXX`
- ZIPDIR2=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME2.zipdir.XXXXXXXXXX`
-
- pushd $TMPDIR2
- unzip -qq -o $zip2
- rm -f $zip2
-
- # create the directories first
- for d in `find -type d | LC_ALL=C sort`; do
- mkdir -p $ZIPDIR2/$d
- done
- # move the contents over to the a new directory in order and set the times.
- for f in `find -type f | LC_ALL=C sort`; do
- cp $f $ZIPDIR2/$f
- touch --date="1970-01-01 UTC" $ZIPDIR2/$f
- done
- popd
-
- # Set the times of the directories.
- touch --date="1970-01-01 UTC" `find $ZIPDIR2 -type d`
-
- # make the new zip
- pushd $ZIPDIR2
- find -type f -print | LC_ALL=C sort | /usr/bin/zip -q -X -9 $zip2 -@
- popd
-
- # Cleanup.
- rm -rf $TMPDIR2
- rm -rf $ZIPDIR2
- done
- fi
-
- # now on to the original zip or jar.
- # create the directories first
- for d in `find -type d | LC_ALL=C sort`; do
- mkdir -p $ZIPDIR/$d
- done
- # move the contents over to the a new directory in order and set the times.
- for f in `find -type f | LC_ALL=C sort`; do
- cp $f $ZIPDIR/$f
- touch --date="1970-01-01 UTC" $ZIPDIR/$f
- done
- popd
-
- # Set the times of the directories.
- touch --date="1970-01-01 UTC" `find $ZIPDIR -type d`
-
- # make the new zip
- pushd $ZIPDIR
- find -type f -print | LC_ALL=C sort | /usr/bin/zip -q -X -9 $zip -@
- popd
-
- # Cleanup.
- rm -rf $TMPDIR
- rm -rf $ZIPDIR
-done
-rm -rf ${RPM_BUILD_ROOT}/tmp
+rm plugins/com.jcraft.jsch_0.1.31.jar
+ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
# remove this python script so that it is not aot compiled, thus avoiding a
# multilib conflict
@@ -1406,7 +1118,7 @@
%postun pde-runtime -p %{_bindir}/rebuild-gcj-db
%post pde-sdk -p %{_bindir}/rebuild-gcj-db
%postun pde-sdk -p %{_bindir}/rebuild-gcj-db
-%endif
+%endif
%files ecj
%defattr(-,root,root)
@@ -1433,8 +1145,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}
@@ -1454,40 +1164,46 @@
%{_datadir}/%{name}/notice.html
%{_datadir}/%{name}/epl-v10.html
%{_datadir}/%{name}/links
+%{_datadir}/%{name}/startup.jar
%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_*
-%{_datadir}/%{name}/plugins/org.eclipse.update.configurator_*
-%{_datadir}/%{name}/plugins/org.eclipse.osgi_*
-%{_datadir}/%{name}/plugins/org.eclipse.equinox.registry_*
-%{_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.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
%{_libdir}/gcj/%{name}/org.eclipse.osgi_*
%endif
%{_libdir}/gcj/%{name}/org.eclipse.equinox.registry_*
-%{_libdir}/gcj/%{name}/com.ibm.icu_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.launcher_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.app_*
%{_libdir}/gcj/%{name}/org.eclipse.jface_*
%{_libdir}/gcj/%{name}/org.eclipse.jface.databinding_*
%{_libdir}/gcj/%{name}/org.eclipse.core.commands_*
@@ -1501,7 +1217,8 @@
%{_libdir}/gcj/%{name}/org.eclipse.equinox.common_*
%{_libdir}/gcj/%{name}/org.eclipse.help_*
%{_libdir}/gcj/%{name}/org.eclipse.core.contenttype_*
-%{_libdir}/gcj/%{name}/startup.jar*
+%{_libdir}/gcj/%{name}/org.eclipse.core.databinding_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.databinding.beans_*
%endif
%files rcp-sdk
@@ -1509,139 +1226,187 @@
%{_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)
%attr(0755,root,root) %{_bindir}/%{name}
%{_datadir}/%{name}/eclipse.ini
+%{_libdir}/%{name}/eclipse
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/icons/*/*/apps/*
%{_datadir}/%{name}/features/org.eclipse.platform_*
-%{_datadir}/%{name}/plugins/org.eclipse.equinox.initializer_*
-%{_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.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.ui.ide_*
-%{_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
@@ -1666,19 +1431,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
@@ -1686,6 +1451,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)
@@ -1697,12 +1463,14 @@
%{_datadir}/%{name}/plugins/org.eclipse.pde.core_*
%{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*
%{_datadir}/%{name}/plugins/org.eclipse.pde.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.ui.templates_*
%{_datadir}/%{name}/buildscripts
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.pde_*
%{_libdir}/gcj/%{name}/org.eclipse.pde.core_*
%{_libdir}/gcj/%{name}/org.eclipse.pde.junit.runtime_*
%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui.templates_*
%{_libdir}/gcj/%{name}/pdebuild.jar*
%{_libdir}/gcj/%{name}/pdebuild-ant.jar*
%endif
@@ -1725,107 +1493,47 @@
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
-* Tue Jun 20 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-15
-- Add Java-1.7.profile to org.eclipse.osgi for IcedTea.
-
-* Thu May 17 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-14
-- BR/R tomcat5 >= 5.5.23.
-- Fix broken symlinks for tomcat5 5.5.23.
-
-* Tue May 15 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-13
-- Another bug fix for launch-addplatformtotildeeclipse.patch.
-- Add BR/B tomcat >= 5.5.20 instead of just = 5.5.20.
-- Resolves: #240025.
-
-* Wed May 02 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-12
-- Fix additional problem with launcher-addplatformtotildeeclipse.patch.
-- Resolves: #238109.
-
-* Mon Apr 30 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-11
-- Add workaround in launcher-addplatformtotildeeclipse.patch for problems
- caused by bug #238109.
-- Resolves: #238109.
-
-* Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-10
-- Fix problem in launcher-addplatformtotildeeclipse.patch.
-- Resolves: #238109.
-
-* Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-9
-- Remove BR eclipse-pde.
-- Related: #236895
-
-* Wed Apr 11 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-8
-- Link to system-installed jsch instead of including it.
-- Fix links to system-installed javadocs.
-
-* Tue Mar 20 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-7
-- Remove search and processing for mac encoded files.
-- Remove BR dos2unix.
-
-* Mon Mar 19 2007 Thomas Fitzsimmons <fitzsim at redhat.com> 3.2.2-6
-- Remove gjdoc build requirement.
-
-* Fri Mar 16 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-5
-- Update package-build releng script to work with mylar.
-
-* Thu Mar 15 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-4
-- Update to tomcat 5.5.20.
-
-* Fri Mar 02 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-3
-- Uncomment 'this.generatePackagesStructure = true;' in ecj-gcj patch.
-
-* Mon Feb 26 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-2
-- Add gcc messages to ecj-gcj patch.
-
-* Wed Feb 21 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-1
-- 3.2.2.
-- Remove patch that disables Java 5 code.
-- Add -DjavacSource=1.5 -DjavacTarget=1.5 to ant compile line.
-
-* Wed Feb 07 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-37
-- Move rcp feature to %%{_libdir} to avoid multilib conflict on ppc{,64}.
-
-* Tue Feb 06 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-36
-- Rework ppc64, s390{x} and sparc{64} hack again to try to fix multilib
- problem.
-
-* Thu Feb 01 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-35
-- Use original name for the SWT JNI symlinks.
-- Rework ppc64, s390{x} and sparc{64} hack to fix multilib problem.
-- Update ecj [] patch to upstream version from 3.3.
-
-* Tue Jan 30 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-34
-- Create symlinks to the SWT JNI libs in %%{_libdir}/eclipse with sane
- versions.
-
-* Mon Jan 29 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-33
-- Check for features directory in sdk postun script.
-- Resolves: #224588.
-
-* Fri Jan 26 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-32
-- Fix bug in ecj [] patch.
-
-* Tue Jan 16 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-31
-- Add bugzilla reference to remove jars bug in comment.
-- Update bugzilla refereces to [] bugs.
-
-* Fri Jan 12 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-30
-- Fix %%postun problem in the sdk sub-package.
-
-* Thu Jan 11 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-29
-- Remove SWT JNI symlinks from %%{libdir}.
-
-* Wed Jan 10 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-28
-- Rpmlint cleanups.
-
-* Fri Jan 05 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-27
-- Use /g in tomcat version replacement.
-- Disable com.jcraft.jsch_0.1.28.jar and
- org.eclipse.osgi_3.2.1.R32x_v20060919.jar on ia64.
-
-* Tue Dec 19 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-26
-- Use sed instead of patch for tomcat version.
-- Add BuildRequires desktop-file-utils.
+* Tue Jun 19 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.RC4
+- Use icu4j-eclipse sub-package instead of building icu4j here.
+- Use exec in binary wrapper.
+- Add 3.3.0 splashscreen.
+
+* Tue Jun 12 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC4
+- 3.3RC4.
+
+* Mon Jun 11 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.RC3
+- Update launching strategy for 3.3.
+- Pull in package-build fix from F-7.
+
+* 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.
+
+* Mon Feb 26 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.M5eh
+- 3.3M5.
+- Remove launcher-addplatformtotildeeclipse.patch as it's only needed
+ for FC-5 -> FC-6.
+- Remove swt firefox patches as they are no longer needed.
+- Remove ppc64, s390{,x} and sparc{,64} support.
+- Remove use-built-launcher patch.
+- Update set-launcher-and-configuration-dir patch.
+
+* Mon Jan 29 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.3.M4
+- Enable updated ecj square brackets patch.
+
+* Fri Jan 12 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.M4
+- Pull in fixes from rawhide.
+
+* Wed Dec 20 2006 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.M4
+- 3.3M4.
+- Update patches for 3.3M4.
+- Remove SWT JNI symlinks in %%{_libdir}.
* Wed Dec 6 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-25
- Add %%{_libdir}/eclipse dir to files list of libswt-gtk2.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 26 Jun 2007 16:01:53 -0000 1.46
+++ sources 27 Jun 2007 15:56:57 -0000 1.47
@@ -1,4 +1,3 @@
-c3be75d8af3c31b7a1748247ab3fee95 icu4jsrc_3_4_5.jar
e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2
-5d1b9f6a146ffc59191e513083a6ec86 eclipse-sourceBuild-srcIncluded-3.2.2.zip
-d48b18e6e50ce7713242a3e0092fdbe9 eclipse-fedora-splash-3.2.2.png
+8a50adfea6b126fdbd231a620f94a5ca eclipse-sourceBuild-srcIncluded-3.3RC4.zip
+3f5ee621f738ee107e312817dadacab4 eclipse-fedora-splash-3.3.0.png
--- eclipse-ecj-square-bracket-classpath.patch DELETED ---
--- eclipse-launcher-addplatformtotildeeclipse.patch DELETED ---
--- eclipse-libupdatebuild.patch DELETED ---
--- eclipse-osgi-Java-1.7-profile.patch DELETED ---
--- eclipse-ppc64gre64.patch DELETED ---
--- eclipse-swt-firefox.2.patch DELETED ---
--- eclipse-swt-firefox.patch DELETED ---
--- eclipse-updatehomedir.patch DELETED ---
--- eclipse-usebuiltlauncher.patch DELETED ---
--- eclipse-webapp-tomcat55.patch DELETED ---
--- eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch DELETED ---
More information about the fedora-extras-commits
mailing list