From 9ef820f7f61a1300fd83442bec786fe9f2b0f37a Mon Sep 17 00:00:00 2001 From: Phillip Muldoon Date: May 23 2005 17:01:40 +0000 Subject: - Remove compilation of jdt.ui jar.so on ppc. Sat May 21 2005 Ben Konrath 3.1.0_fc-0.M7.3 - Add ecj-options patch to bootstrap source. - Make embedded browser widget work (Robin Green). - Bump required version of java-gcj-compat to the latest (-40jpp_24rh). - Use -lgcjawt when building with gcj. Wed May 18 2005 Ben Konrath 3.1.0_fc-0.M7.2 - Disable org.eclipse.osgi_3.1.0.jar.so. - Add ecj-options patch, remove ecj-extdirs patch. Wed May 18 2005 Ben Konrath 3.1.0_fc-0.M7.1 - Update to 3.1M7. - Add file initializer patch. - Temporarily remove s390{,x} patches. - Update GNU formatter ui patch. - Add ECJ ext dirs patch. --- diff --git a/.cvsignore b/.cvsignore index cd40a66..7266111 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ -eclipse-sourceBuild-srcIncluded-3.1M6.zip -eclipse-native-splash-3.1-M6.png +eclipse-sourceBuild-srcIncluded-3.1M7.zip +eclipse-native-splash-3.1-M7.png +ecj-M5.zip diff --git a/eclipse-swttools.patch b/eclipse-swttools.patch index f798d03..dfd5fa6 100644 --- a/eclipse-swttools.patch +++ b/eclipse-swttools.patch @@ -1,10 +1,10 @@ Index: build.xml =================================================================== -RCS file: /home/eclipse/org.eclipse.swt.gtk64/build.xml,v -retrieving revision 1.43 -diff -u -r1.43 build.xml ---- build.xml 18 Mar 2005 13:45:25 -0000 1.43 -+++ build.xml 5 Apr 2005 22:27:49 -0000 +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 @@ -20,7 +20,6 @@ @@ -13,14 +13,25 @@ diff -u -r1.43 build.xml -@@ -188,6 +187,10 @@ +@@ -184,8 +183,11 @@ + -+ + + - +- ++ + + +@@ -278,6 +280,8 @@ + + + ++ ++ + + + diff --git a/eclipse-updatehomedir.patch b/eclipse-updatehomedir.patch index b1edc47..f2076b5 100644 --- a/eclipse-updatehomedir.patch +++ b/eclipse-updatehomedir.patch @@ -1,120 +1,947 @@ -? @dot -? build.xml -? org.eclipse.update.ui_3.1.0.jar +Index: src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java +=================================================================== +RCS file: /home/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java,v +retrieving revision 1.18 +diff -u -r1.18 ModeSelectionPage.java +--- src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java 11 Apr 2005 22:45:30 -0000 1.18 ++++ src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java 18 May 2005 01:18:01 -0000 +@@ -10,17 +10,23 @@ + *******************************************************************************/ + package org.eclipse.update.internal.ui.wizards; + +-import org.eclipse.jface.dialogs.*; ++import org.eclipse.core.runtime.Platform; + import org.eclipse.jface.dialogs.Dialog; ++import org.eclipse.jface.dialogs.IDialogSettings; + import org.eclipse.swt.SWT; +-import org.eclipse.swt.events.*; +-import org.eclipse.swt.layout.*; +-import org.eclipse.swt.widgets.*; +-import org.eclipse.ui.*; ++import org.eclipse.swt.events.SelectionAdapter; ++import org.eclipse.swt.events.SelectionEvent; ++import org.eclipse.swt.layout.GridData; ++import org.eclipse.swt.layout.GridLayout; ++import org.eclipse.swt.widgets.Button; ++import org.eclipse.swt.widgets.Composite; ++import org.eclipse.swt.widgets.Control; ++import org.eclipse.swt.widgets.Label; ++import org.eclipse.ui.PlatformUI; + import org.eclipse.update.internal.operations.UpdateUtils; + import org.eclipse.update.internal.ui.UpdateUI; + import org.eclipse.update.internal.ui.UpdateUIMessages; +-import org.eclipse.update.search.*; ++import org.eclipse.update.search.UpdateSearchRequest; + + /** + */ +@@ -65,10 +71,17 @@ + GridLayout layout = new GridLayout(); + composite.setLayout(layout); + updatesButton = new Button(composite, SWT.RADIO); +- updatesButton.setText(UpdateUIMessages.ModeSelectionPage_updates); ++ updatesButton.setText(UpdateUIMessages.ModeSelectionPage_updates); + updateMode = !getSettings().getBoolean(P_NEW_FEATURES_MODE); ++ // don't allow updates if the installation location is readonly ++ if (Platform.getInstallLocation().isReadOnly()) { ++ updatesButton.setEnabled(false); ++ updateMode = false; ++ } + updatesButton.setSelection(updateMode); + ++ ++ + final Label updatesText = new Label(composite, SWT.WRAP); + updatesText.setText(UpdateUIMessages.ModeSelectionPage_updatesText); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); Index: src/org/eclipse/update/internal/ui/wizards/TargetPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java,v -retrieving revision 1.67 -diff -u -r1.67 TargetPage.java ---- src/org/eclipse/update/internal/ui/wizards/TargetPage.java 1 Mar 2005 20:29:25 -0000 1.67 -+++ src/org/eclipse/update/internal/ui/wizards/TargetPage.java 19 Apr 2005 23:05:52 -0000 -@@ -10,24 +10,45 @@ - *******************************************************************************/ - package org.eclipse.update.internal.ui.wizards; - +retrieving revision 1.71 +diff -u -r1.71 TargetPage.java +--- src/org/eclipse/update/internal/ui/wizards/TargetPage.java 28 Apr 2005 18:22:31 -0000 1.71 ++++ src/org/eclipse/update/internal/ui/wizards/TargetPage.java 18 May 2005 01:18:01 -0000 +@@ -1,420 +1,463 @@ +-/******************************************************************************* +- * Copyright (c) 2000, 2005 IBM Corporation and others. +- * All rights reserved. This program and the accompanying materials +- * are made available under the terms of the Eclipse Public License v1.0 +- * which accompanies this distribution, and is available at +- * http://www.eclipse.org/legal/epl-v10.html +- * +- * Contributors: +- * IBM Corporation - initial API and implementation +- *******************************************************************************/ +-package org.eclipse.update.internal.ui.wizards; +- -import java.io.*; -import java.util.*; -+import java.io.File; -+import java.util.HashSet; -+import java.util.Iterator; - -+import org.eclipse.core.runtime.CoreException; -+import org.eclipse.core.runtime.IStatus; - import org.eclipse.jface.dialogs.Dialog; +- +-import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.resource.*; -import org.eclipse.jface.viewers.*; +-import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.*; -import org.eclipse.swt.events.*; -import org.eclipse.swt.graphics.*; -import org.eclipse.swt.layout.*; -import org.eclipse.swt.widgets.*; --import org.eclipse.ui.help.*; +-import org.eclipse.ui.*; -import org.eclipse.update.configuration.*; -import org.eclipse.update.core.*; -import org.eclipse.update.internal.operations.*; -import org.eclipse.update.internal.ui.*; -import org.eclipse.update.internal.ui.parts.*; -import org.eclipse.update.operations.*; -+import org.eclipse.jface.resource.ImageDescriptor; -+import org.eclipse.jface.viewers.ISelectionChangedListener; -+import org.eclipse.jface.viewers.IStructuredContentProvider; -+import org.eclipse.jface.viewers.IStructuredSelection; -+import org.eclipse.jface.viewers.ITableLabelProvider; -+import org.eclipse.jface.viewers.LabelProvider; -+import org.eclipse.jface.viewers.SelectionChangedEvent; -+import org.eclipse.jface.viewers.StructuredSelection; -+import org.eclipse.jface.viewers.TableViewer; -+import org.eclipse.swt.SWT; -+import org.eclipse.swt.events.SelectionAdapter; -+import org.eclipse.swt.events.SelectionEvent; -+import org.eclipse.swt.graphics.Image; -+import org.eclipse.swt.layout.GridData; -+import org.eclipse.swt.layout.GridLayout; -+import org.eclipse.swt.widgets.Button; -+import org.eclipse.swt.widgets.Composite; -+import org.eclipse.swt.widgets.Control; -+import org.eclipse.swt.widgets.Label; -+import org.eclipse.ui.help.WorkbenchHelp; -+import org.eclipse.update.configuration.IConfiguredSite; -+import org.eclipse.update.configuration.IInstallConfiguration; -+import org.eclipse.update.configuration.IInstallConfigurationChangedListener; -+import org.eclipse.update.configuration.LocalSystemInfo; -+import org.eclipse.update.core.IFeature; -+import org.eclipse.update.internal.operations.UpdateUtils; -+import org.eclipse.update.internal.ui.UpdateLabelProvider; -+import org.eclipse.update.internal.ui.UpdateUI; -+import org.eclipse.update.internal.ui.UpdateUIImages; -+import org.eclipse.update.internal.ui.parts.DefaultContentProvider; -+import org.eclipse.update.internal.ui.parts.SWTUtil; -+import org.eclipse.update.operations.IInstallFeatureOperation; - - public class TargetPage extends BannerPage implements IDynamicPage { - private TableViewer jobViewer; -@@ -149,7 +170,7 @@ - label.setLayoutData(gd); - - installLocation = new Label(client, SWT.NULL); +- +-public class TargetPage extends BannerPage implements IDynamicPage { +- private TableViewer jobViewer; +- private IInstallConfiguration config; +- private ConfigListener configListener; +- private Label requiredSpaceLabel; +- private Label availableSpaceLabel; +- private IInstallFeatureOperation[] jobs; +- //private IInstallFeatureOperation currentJob; +- private Label installLocation; +- private Button changeLocation; +- static HashSet added; +- +- class JobsContentProvider +- extends DefaultContentProvider +- implements IStructuredContentProvider { +- public Object[] getElements(Object parent) { +- return jobs; +- } +- } +- +- class JobsLabelProvider +- extends LabelProvider +- implements ITableLabelProvider { +- +- public Image getColumnImage(Object obj, int col) { +- UpdateLabelProvider provider = UpdateUI.getDefault().getLabelProvider(); +- +- IInstallFeatureOperation job = (IInstallFeatureOperation) obj; +- ImageDescriptor base = +- job.getFeature().isPatch() +- ? UpdateUIImages.DESC_EFIX_OBJ +- : UpdateUIImages.DESC_FEATURE_OBJ; +- int flags = 0; +- if (job.getTargetSite() == null) +- flags = UpdateLabelProvider.F_ERROR; +- return provider.get(base, flags); +- } +- +- public String getColumnText(Object obj, int col) { +- if (col == 0) { +- IFeature feature = ((IInstallFeatureOperation) obj).getFeature(); +- return feature.getLabel() +- + " " //$NON-NLS-1$ +- + feature.getVersionedIdentifier().getVersion().toString(); +- } +- return null; +- } +- } +- +- class ConfigListener implements IInstallConfigurationChangedListener { +- public void installSiteAdded(IConfiguredSite csite) { +- +- // set the site as target for all jobs without a target +- for (int i=0; jobs != null && i 0) +- jobViewer.setSelection(new StructuredSelection(jobs[0])); +- } +- +- super.setVisible(visible); +- } +- +- private void verifyNotEmpty(boolean empty) { +- String errorMessage = null; +- if (empty) +- errorMessage = UpdateUIMessages.InstallWizard_TargetPage_location_empty; +- setErrorMessage(errorMessage); +- setPageComplete(!empty); +- } +- +- +- private void updateStatus(Object element) { +- if (element == null) { +- requiredSpaceLabel.setText(""); //$NON-NLS-1$ +- availableSpaceLabel.setText(""); //$NON-NLS-1$ +- return; +- } +- IConfiguredSite site = (IConfiguredSite) element; +- File file = new File(site.getSite().getURL().getFile()); +- long available = LocalSystemInfo.getFreeSpace(file); +- long required = computeRequiredSizeFor(site); +- if (required <= 0) +- requiredSpaceLabel.setText(UpdateUIMessages.InstallWizard_TargetPage_unknownSize); +- else +- requiredSpaceLabel.setText( +- NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_size, "" + required)); //$NON-NLS-1$ +- +- if (available == LocalSystemInfo.SIZE_UNKNOWN) +- availableSpaceLabel.setText(UpdateUIMessages.InstallWizard_TargetPage_unknownSize); +- else +- availableSpaceLabel.setText( +- NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_size, "" + available)); //$NON-NLS-1$ +- } +- +- private long computeRequiredSizeFor(IConfiguredSite site) { +- long totalSize = 0; +- for (int i = 0; i < jobs.length; i++) { +- if (site.equals(jobs[i].getTargetSite())) { +- long jobSize = site.getSite().getInstallSizeFor(jobs[i].getFeature()); +- if (jobSize == -1) +- return -1; +- totalSize += jobSize; +- } +- } +- return totalSize; +- } +- +- private void pageChanged() { +- boolean empty = false; +- for (int i=0; jobs!=null && i 0) ++ jobViewer.setSelection(new StructuredSelection(jobs[0])); ++ } ++ ++ super.setVisible(visible); ++ } ++ ++ private void verifyNotEmpty(boolean empty) { ++ String errorMessage = null; ++ if (empty) ++ errorMessage = UpdateUIMessages.InstallWizard_TargetPage_location_empty; ++ setErrorMessage(errorMessage); ++ setPageComplete(!empty); ++ } ++ ++ ++ private void updateStatus(Object element) { ++ if (element == null) { ++ requiredSpaceLabel.setText(""); //$NON-NLS-1$ ++ availableSpaceLabel.setText(""); //$NON-NLS-1$ ++ return; ++ } ++ IConfiguredSite site = (IConfiguredSite) element; ++ File file = new File(site.getSite().getURL().getFile()); ++ long available = LocalSystemInfo.getFreeSpace(file); ++ long required = computeRequiredSizeFor(site); ++ if (required <= 0) ++ requiredSpaceLabel.setText(UpdateUIMessages.InstallWizard_TargetPage_unknownSize); ++ else ++ requiredSpaceLabel.setText( ++ NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_size, "" + required)); //$NON-NLS-1$ ++ ++ if (available == LocalSystemInfo.SIZE_UNKNOWN) ++ availableSpaceLabel.setText(UpdateUIMessages.InstallWizard_TargetPage_unknownSize); ++ else ++ availableSpaceLabel.setText( ++ NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_size, "" + available)); //$NON-NLS-1$ ++ } ++ ++ private long computeRequiredSizeFor(IConfiguredSite site) { ++ long totalSize = 0; ++ for (int i = 0; i < jobs.length; i++) { ++ if (site.equals(jobs[i].getTargetSite())) { ++ long jobSize = site.getSite().getInstallSizeFor(jobs[i].getFeature()); ++ if (jobSize == -1) ++ return -1; ++ totalSize += jobSize; ++ } ++ } ++ return totalSize; ++ } ++ ++ private void pageChanged() { ++ boolean empty = false; ++ for (int i=0; jobs!=null && i x86 %ifarch %{ix86} @@ -23,11 +23,11 @@ ExclusiveArch: %{ix86} x86_64 ppc Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 0.M6.22 +Release: 0.M7.4 License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1M6-200504011645/eclipse-sourceBuild-srcIncluded-3.1M6.zip +Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1M7-200505131415/eclipse-sourceBuild-srcIncluded-3.1M7.zip Source1: %{name}.script Source2: %{name}.desktop Source5: %{name}-48.png @@ -39,41 +39,37 @@ Source10: %{libname}-gtk2.install # this should be replaced with: # Source11: %{name}-native-splash-3.1.png # when Eclipse 3.1 comes out. -Source11: %{name}-native-splash-3.1-M6.png +Source11: %{name}-native-splash-3.1-M7.png Source16: %{name}-copy-platform.sh Source17: %{name}-efj-wrapper.sh +# this zip was taken from the M6 source drop +Source18: ecj-M5.zip # Build libswt-mozilla # https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637 Patch0: %{name}-make-linux.patch -# Work around libgcj #19132 -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19132 -Patch1: %{name}-textsearch.patch # Build JNI libs # FIXME: these should be built by upstream build method -# http://people.redhat.com/bkonrath/eclipse/buildable-source-zips.html +# http://www.bagu.org/eclipse/plugin-source-drops.html # https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637 Patch2: %{name}-build.patch -Patch3: %{name}-swt-libgcjawt.patch Patch4: %{name}-libupdatebuild.patch Patch5: %{name}-libupdatebuild2.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848 Patch10: %{name}-icon.patch # Use installed mozilla libs and headers Patch11: %{name}-libswt-mozilla.patch -# Copy over the source files first -Patch12: %{name}-libswt-mozilla2.patch # We can't really commit to doing builds for these arches upstream, but we # need at least eclipse-ecj to run on them as it's our bytecode compiler for # Fedora. -Patch13: %{name}-s390ands390x.patch +#Patch13: %{name}-s390ands390x.patch # Stupid spaces in directories ... -Patch14: %{name}-s390ands390x2.patch +#Patch14: %{name}-s390ands390x2.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=82916 Patch15: %{name}-build-activeHelpSample.jar.patch # Make find work. See # https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736 -Patch16: %{name}-find.patch +#Patch16: %{name}-find.patch # Build swttools.jar # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364 Patch18: %{name}-swttools.patch @@ -86,13 +82,14 @@ Patch20: %{name}-gnuformatterjdt.patch Patch21: %{name}-gnuformatterjdtui.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630 Patch22: %{name}-updatehomedir.patch -#https://bugs.eclipse.org/bugs/show_bug.cgi?id=82988 -Patch23: %{name}-importArchivedProj.patch -#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155853 -#FIXME: should be removed for 3.1M7 -Patch24: %{name}-combo-bug-backport.patch +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535 +Patch24: %{name}-fileinitializer.patch +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=95690 +Patch25: %{name}-build.xml-typo.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=88364 -Patch25: %{name}-ecj-options.patch +Patch26: %{name}-ecj-options.patch +# work around for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21637 +Patch27: %{name}-startup-url.openStream.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ant @@ -192,7 +189,7 @@ Summary: Eclipse Java development tools Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-ecj = %{epoch}:%{version}-%{release} -Requires: junit >= 3.8.1-3jpp +Requires: junit >= 3.8.1-3jpp %if %{gcj_support} Requires: libgcj >= 4.0.0-2 Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh @@ -252,49 +249,45 @@ pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library %patch0 -p0 %patch11 -p0 %if %{gcj_support} -%patch3 -p0 -%patch14 -p0 +#%patch14 -p0 %endif popd -%if %{gcj_support} -%patch1 -p0 -%endif %patch2 -p0 %patch4 -p0 %patch5 -p0 %patch10 -p0 -%patch12 -p0 %if %{gcj_support} -%patch13 -p1 +#%patch13 -p1 %endif pushd plugins/org.eclipse.platform.doc.isv rm -f activeHelpSample.jar %patch15 -p0 popd %if %{gcj_support} -%patch16 -p0 +#%patch16 -p0 %endif -pushd plugins/org.eclipse.swt.gtk64 +pushd plugins/org.eclipse.swt.gtk.linux.x86_64 %patch18 -p0 popd pushd plugins/org.eclipse.jdt.core %patch19 -p0 -%patch20 -p0 +#%patch20 -p0 popd pushd plugins/org.eclipse.jdt.ui -%patch21 -p0 +#%patch21 -p0 popd pushd plugins/org.eclipse.update.ui %patch22 -p0 popd -pushd plugins/org.eclipse.ui.ide -%patch23 -p0 -popd -pushd plugins/org.eclipse.swt/Eclipse\ SWT +pushd plugins/org.eclipse.core.runtime %patch24 -p0 popd +%patch25 -p2 pushd plugins/org.eclipse.jdt.core -%patch25 -p0 +%patch26 -p0 +popd +pushd plugins/org.eclipse.platform +%patch27 -p0 popd %if %{gcj_support} @@ -303,14 +296,17 @@ popd cp %{SOURCE11} splash.bmp popd + # use M5 ecj rather than the one included + cp %{SOURCE18} jdtcoresrc/src/ecj.zip + # we need to add the ecj-options patch to the bootstrap compiler pushd jdtcoresrc/src - unzip jdtcore.zip - mv jdtcore.zip{,.orig} + unzip ecj.zip + mv ecj.zip{,.orig} dos2unix org/eclipse/jdt/internal/compiler/batch/Main.java dos2unix org/eclipse/jdt/internal/compiler/batch/messages.properties -%patch25 -p1 - zip -9 -r jdtcore.zip * +%patch26 -p1 + zip -9 -r ecj.zip * rm -r org popd %endif @@ -371,8 +367,6 @@ ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar #ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar #ln -sf %{_datadir}/lucene/lucene-demos-1.4.3.jar plugins/org.apache.lucene/parser.jar # plugins/org.eclipse.core.boot/boot.jar -ln -sf %{_javadir}/ant.jar plugins/org.eclipse.core.resources/lib/ant.jar -# plugins/org.eclipse.core.resources/lib/antsupport.jar # plugins/org.eclipse.osgi/osgi/collx.jar # plugins/org.eclipse.osgi/osgi/ee.foundation.jar # plugins/org.eclipse.osgi/osgi/ee.minimum.jar @@ -381,7 +375,7 @@ ln -sf %{_javadir}/ant.jar plugins/org.eclipse.core.resources/lib/ant.jar #ln -sf %{_javadir}/xml-commons-apis.jar plugins/org.eclipse.osgi/osgi/xmlParserAPIs.jar # plugins/org.eclipse.osgi.services/services.jar # plugins/org.eclipse.osgi.util/util.jar -ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar +# =====>>>>>>>>>>>ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar # plugins/org.eclipse.text/text.jar # ------------------------------------------------------------------------ # FIXME: need tomcat4 rpm @@ -414,13 +408,17 @@ ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar ln -sf %{_javadir}/junit.jar plugins/org.junit/junit.jar rm -f *.jar -# /usr/lib -> /usr/lib64 + pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library - perl -pe 's|/usr/lib/|%{_libdir}/|g' \ - build.sh > build.sh.patched - mv build.sh.patched build.sh +# /usr/lib -> /usr/lib64 +sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh +%if %{gcj_support} + # link against gcj's jawt implementation. + sed --in-place "s/-ljawt/-lgcjawt/" make_linux.mak +%endif popd + %build ORIGCLASSPATH=$CLASSPATH @@ -433,7 +431,7 @@ ORIGCLASSPATH=$CLASSPATH # Unzip the "stable compiler" source into a temp dir and build it. # Note: we don't want to build the CompilerAdapter. mkdir ecj-bootstrap-tmp - unzip -qq -d ecj-bootstrap-tmp jdtcoresrc/src/jdtcore.zip + 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 @@ -445,7 +443,7 @@ ORIGCLASSPATH=$CLASSPATH xargs jar cf ../ecj-bootstrap.jar popd - # Delete our modified jdtcore + # Delete our modified ecj and restore the backup rm -rf ecj-bootstrap-tmp ## 1b. Natively-compile it @@ -476,7 +474,7 @@ ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml %endif # 3. Use this ecj to rebuild itself -export CLASSPATH=`pwd`/jdtcoresrc/jdtcore.jar:$ORIGCLASSPATH +export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH ant -buildfile jdtcoresrc/compilejdtcore.xml %if %{gcj_support} @@ -492,7 +490,7 @@ ant -buildfile jdtcoresrc/compilejdtcore.xml %endif # Build the rest of Eclipse -export CLASSPATH=`pwd`/jdtcore.jar:$ORIGCLASSPATH +export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH ant \ -Dnobootstrap=true \ -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \ @@ -525,9 +523,18 @@ ant \ rm -f plugins/org.apache.ant_1.6.2/lib/ant.jar rm -f plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.18.jar rm -f plugins/org.junit_3.8.1/junit.jar - + + # extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.0.jar + unzip -d plugins plugins/org.eclipse.jdt.core_3.1.0.jar jdtCompilerAdapter.jar + # Native build -- do -O2 on x86 and ppc only (for now) # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20606, for example + + # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158308 + %ifarch ppc + mv plugins/org.eclipse.jdt.ui_3.1.0.jar{,.bak} + %endif + %ifarch %{ix86} ppc mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name} for j in `find -name \*.jar`; do @@ -545,6 +552,10 @@ ant \ -o $d/`basename $j`.so $j; done %endif + + %ifarch ppc + mv plugins/org.eclipse.jdt.ui_3.1.0.jar{.bak,} + %endif # FIXME: temporarily disable org.eclipse.ui.workbench_3.1.0.jar.so # see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919 @@ -554,11 +565,15 @@ ant \ # see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146463 mv \ .%{_libdir}/%{name}/plugins/org.eclipse.ui.forms_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak} + # FIXME: temporarily disable org.eclipse.osgi_3.1.0.jar.so + # see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158137 + mv \ + .%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak} - pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0 + pushd .%{_libdir}/%{name}/plugins gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \ - -Wl,-R,%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0 \ - jdtcore.jar.so jdtCompilerAdapter.jar.so -o ecj + -Wl,-R,%{_libdir}/%{name}/plugins \ + org.eclipse.jdt.core_3.1.0.jar.so jdtCompilerAdapter.jar.so -o ecj popd # Tar up the native libs @@ -568,10 +583,30 @@ ant \ # Remove expanded eclipse build rm -rf eclipse - popd %endif +# Hack to get the -debuginfo source code references +# to be pointing to the right place: +# Hardlink all the org.* source we can find +# Presumably, all the zipped source gets unzipped before compilation? +#src_root=$PWD/plugins +#pushd result +#mkdir -p eclipse/org +#collected_src_dir=$PWD/eclipse +#cat >copyallsrc <<-EOF +# #! /bin/bash -peu +# cd "\$1" +# echo "Copying all .java source files from \$1 to $collected_src_dir..." +# find . -type f -name '*.java' -print0 \ +# | xargs -0 -r cp -l --parents --target-directory=$collected_src_dir/org +#EOF +#chmod u+x copyallsrc +## Special case logic for SWT - only copy linux-gtk source +#find $src_root -type d -a \( -name org.eclipse.swt -prune -o -name org -print0 \) | xargs -l -0 ./copyallsrc +#./copyallsrc $src_root/org.eclipse.swt/Eclipse\ SWT/gtk/org +#popd + %install rm -rf $RPM_BUILD_ROOT @@ -580,19 +615,24 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \ result/org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz +# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.0.jar (again) +pushd $RPM_BUILD_ROOT%{_datadir}/%{name} +unzip -d plugins plugins/org.eclipse.jdt.core_3.1.0.jar jdtCompilerAdapter.jar +popd + # Binaries, libraries, and natively-built shared libraries install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name} %if %{gcj_support} -# Natively-compiled jars (shared libraries) -tar -C $RPM_BUILD_ROOT -zxf result/%{name}-nativelycompiledjars.tar.gz + # Natively-compiled jars (shared libraries) + tar -C $RPM_BUILD_ROOT -zxf result/%{name}-nativelycompiledjars.tar.gz %endif install -d -m 755 $RPM_BUILD_ROOT%{_bindir} %if %{gcj_support} # Install ecj binary -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/ecj \ +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/ecj \ $RPM_BUILD_ROOT%{_bindir} chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj @@ -636,7 +676,7 @@ popd install -d -m 755 $RPM_BUILD_ROOT%{_javadir} pushd $RPM_BUILD_ROOT%{_javadir} -ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{version}.jar +ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar #ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar #ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-mozilla.jar swt-mozilla-%{version}.jar #ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-cairo.jar swt-cairo-%{version}.jar @@ -751,7 +791,7 @@ ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_*/lib/ant-trax.jar ###ln -sf %{_javadir}/xml-commons-apis.jar plugins/org.eclipse.osgi_*/osgi/xmlParserAPIs.jar # plugins/org.eclipse.osgi.services_*/services.jar # plugins/org.eclipse.osgi.util_*/util.jar -ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar +#===> ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar # plugins/org.eclipse.text/text_*.jar ## BEGIN TOMCAT4 ## ##ln -sf %{tomcat4dir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar @@ -780,10 +820,10 @@ ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar ## END TOMCAT4 ## ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar -# Copy jdtcore.jar to %{_datadir}/java for eclipse-ecj +# Copy org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar to %{_datadir}/java for eclipse-ecj mkdir -p $RPM_BUILD_ROOT%{_datadir}/java -ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \ - $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar +ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar \ + $RPM_BUILD_ROOT%{_datadir}/java/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar %if %{gcj_support} # Create the gcj dbs for libswt, ecj, platform, jdt, and pde @@ -797,11 +837,11 @@ gcj-dbtool -n $gcjdbdir/%{name}-pde.db 80000 # ecj db gcj-dbtool -f $gcjdbdir/%{name}-ecj.db \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \ - %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar.so + $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar \ + %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar.so gcj-dbtool -f $gcjdbdir/%{name}-ecj.db \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtCompilerAdapter.jar \ - %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtCompilerAdapter.jar.so + $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar \ + %{_libdir}/%{name}/plugins/jdtCompilerAdapter.jar.so # jdt db for dir in `cat %{SOURCE7}`; do @@ -903,13 +943,15 @@ fi %dir %{_datadir}/%{name}/features %dir %{_datadir}/%{name}/configuration %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.* -%{_datadir}/java/jdtcore*.jar +%{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar +%{_datadir}/java/org.eclipse.jdt.core_3.*.jar %if %{gcj_support} # Native bits %{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-ecj.db %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins -%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0 +%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0.jar.so +%{_libdir}/%{name}/plugins/jdtCompilerAdapter.jar.so %{_bindir}/ecj %endif @@ -935,13 +977,9 @@ fi %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins %{_libdir}/%{name}/plugins/org.eclipse.swt_3.1.0.jar.so -%ifarch alpha ia64 ppc64 sparc64 x86_64 -%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0.jar.so -%else -%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0.jar.so -%endif +%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.0.jar.so %{_libdir}/%{name}/plugins/org.eclipse.jface_3.1.0.jar.so -%{_libdir}/%{name}/plugins/org.eclipse.jface.text_3.1.0 +%{_libdir}/%{name}/plugins/org.eclipse.jface.text_3.1.0.jar.so %endif %files jdt -f %{name}-jdt.install @@ -949,13 +987,15 @@ fi %if %{gcj_support} # Native bits %{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-jdt.db -%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_3.1.0 +%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_3.1.0.jar.so %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_3.1.0 %{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_3.1.0 %{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_3.1.0 -%dir %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0 +%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_3.1.0.jar.so +%ifnarch ppc +%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0.jar.so +%endif +%{_libdir}/%{name}/plugins/org.eclipse.jdt_3.1.0.jar.so #%{_libdir}/%{name}/plugins/org.junit_3.8.1/junit.jar.so %endif @@ -968,11 +1008,11 @@ fi # Native bits %{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-pde.db %{_libdir}/%{name}/plugins/org.eclipse.pde.build_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.pde.core_3.1.0 +%{_libdir}/%{name}/plugins/org.eclipse.pde.core_3.1.0.jar.so %{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.pde.ui_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.pde_3.1.0 +%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.pde.ui_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.pde_3.1.0.jar.so %endif %files pde-devel @@ -1012,47 +1052,49 @@ fi %{_libdir}/%{name}/plugins/org.eclipse.ui.views_3.1.0.jar.so %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_3.1.0.jar.so %{_libdir}/%{name}/plugins/org.eclipse.update.core_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_3.1.0.jar.so %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_3.1.0.jar.so %{_libdir}/%{name}/plugins/org.eclipse.update.ui_3.1.0.jar.so -%{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.jar.so -%{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.compare_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.0.0 -%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.core.variables_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.debug.core_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.0.0 -%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_3.0.0 +%{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.jar.so.bak +%{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.compare_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.0.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.core.variables_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.debug.core_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.0.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_3.0.0.jar.so %{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_3.1.0 %{_libdir}/%{name}/plugins/org.eclipse.platform_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.search_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.team.core_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.team.ui_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.text_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_3.0.0 -%{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_3.1.0 +%{_libdir}/%{name}/plugins/org.eclipse.search_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.team.core_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.team.ui_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.text_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_3.1.0.jar.so %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.ui.editors_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0 +%{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.ui.editors_3.1.0.jar.so +%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0.jar.so %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0 -%{_libdir}/%{name}/plugins/org.eclipse.ui.console_3.1.0 +%{_libdir}/%{name}/plugins/org.eclipse.ui.console_3.1.0.jar.so # FIXME build packages for these so we don't have their jars and jar.sos in # eclipse-platform %{_libdir}/%{name}/plugins/org.apache.lucene_1.4.3 %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1 -%{_libdir}/%{name}/plugins/org.apache.ant_1.6.2 +%{_libdir}/%{name}/plugins/org.apache.ant_1.6.3 %endif %files platform-devel @@ -1061,16 +1103,25 @@ fi %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0 %changelog -* Sun May 22 2005 Ben Konrath 3.1.0_fc-0.M6.22 -- Bump required version of java-gcj-compat to the latest (-40jpp_24rh). -- Add patch to make swt use libgcjawt instead of libjawt for gcj. +* Sun May 22 2005 Andrew Overholt 3.1.0_fc-0.M7.4 +- Remove compilation of jdt.ui jar.so on ppc. -* Fri May 20 2005 Ben Konrath 3.1.0_fc-0.M6.21 +* Sat May 21 2005 Ben Konrath 3.1.0_fc-0.M7.3 - Add ecj-options patch to bootstrap source. - Make embedded browser widget work (Robin Green). - -* Thu May 19 2005 Ben Konrath 3.1.0_fc-0.M6.20 -- Add ecj-options patch. +- Bump required version of java-gcj-compat to the latest (-40jpp_24rh). +- Use -lgcjawt when building with gcj. + +* Wed May 18 2005 Ben Konrath 3.1.0_fc-0.M7.2 +- Disable org.eclipse.osgi_3.1.0.jar.so. +- Add ecj-options patch, remove ecj-extdirs patch. + +* Wed May 18 2005 Ben Konrath 3.1.0_fc-0.M7.1 +- Update to 3.1M7. +- Add file initializer patch. +- Temporarily remove s390{,x} patches. +- Update GNU formatter ui patch. +- Add ECJ ext dirs patch. * Tue May 17 2005 Andrew Overholt 3.1.0_fc-0.M6.19 - Add Epoch on eclipse-platform. diff --git a/sources b/sources index a469d62..83a9b11 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -51d81345d2fa0e8aa0b455f6cf4c447f eclipse-sourceBuild-srcIncluded-3.1M6.zip -87f844d4b82a5abc5baac36025a7619d eclipse-native-splash-3.1-M6.png +a51cad364164de7c3cd65bf48037a8f9 eclipse-native-splash-3.1-M7.png +30279e8c74de2db219418f645291be39 eclipse-sourceBuild-srcIncluded-3.1M7.zip +60f8146948470d0ef7c275f26b874a31 ecj-M5.zip