rpms/eclipse/devel eclipse-compare-create-api.patch, NONE, 1.1 eclipse-swt-nocairo.fc4.patch, NONE, 1.1 eclipse-dontgeneratehelpindices.patch, 1.1, 1.2 eclipse-platform.install, 1.8, 1.9 eclipse-tomcat5-build.2.patch, 1.1, 1.2 eclipse.script, 1.13, 1.14 eclipse.spec, 1.155, 1.156 sources, 1.25, 1.26 eclipse-tomcat5-build.2.m7.patch, 1.1, NONE eclipse-tomcat5-build.m7.patch, 1.1, NONE eclipse-tomcat5.m7.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jun 27 19:38:33 UTC 2005
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3136
Modified Files:
eclipse-dontgeneratehelpindices.patch eclipse-platform.install
eclipse-tomcat5-build.2.patch eclipse.script eclipse.spec
sources
Added Files:
eclipse-compare-create-api.patch eclipse-swt-nocairo.fc4.patch
Removed Files:
eclipse-tomcat5-build.2.m7.patch
eclipse-tomcat5-build.m7.patch eclipse-tomcat5.m7.patch
Log Message:
* Sun Jun 26 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.RC4.1
- Import 3.1 RC4.
- Remove activeHelpSample.jar building patch as it's now fixed upstream.
- Add patch to remove references to cairo since we don't have it in FC4.
- Add about.html and about_files to eclipse-platform.install.
- Add patch to create public compare API (jpound - e.o#98707).
- Add patch from Robin Green to not look for firefox libxpcom.so (rh#161658).
- Symlink lucene jars (rh#159939).
eclipse-compare-create-api.patch:
compare/org/eclipse/compare/CompareWithPatchAction.java | 162 ++++++++++
compare/org/eclipse/compare/PatchDialogSettings.java | 46 ++
compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java | 154 ---------
compare/org/eclipse/compare/internal/patch/InputPatchPage.java | 75 +++-
compare/org/eclipse/compare/internal/patch/PatchWizard.java | 6
plugin.xml | 2
6 files changed, 265 insertions(+), 180 deletions(-)
--- NEW FILE eclipse-compare-create-api.patch ---
Index: plugin.xml
===================================================================
RCS file: /home/eclipse/org.eclipse.compare/plugin.xml,v
retrieving revision 1.57
diff -u -r1.57 plugin.xml
--- plugin.xml 9 May 2005 16:20:33 -0000 1.57
+++ plugin.xml 8 Jun 2005 20:26:59 -0000
@@ -195,7 +195,7 @@
<action
label="%CompareWithPatchAction.label"
tooltip="%CompareWithPatchAction.tooltip"
- class="org.eclipse.compare.internal.patch.CompareWithPatchAction"
+ class="org.eclipse.compare.CompareWithPatchAction"
menubarPath="team.main/group1"
enablesFor="1"
id="compareWithPatch">
Index: compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java
===================================================================
RCS file: compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java
diff -N compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java
--- compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java 14 Apr 2005 13:53:03 -0000 1.17
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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.compare.internal.patch;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardDialog;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.compare.internal.*;
-
-
-public class CompareWithPatchAction extends BaseCompareAction {
-
- static class PatchWizardDialog extends WizardDialog {
-
- PatchWizardDialog(Shell parent, IWizard wizard) {
- super(parent, wizard);
-
- setShellStyle(getShellStyle() | SWT.RESIZE);
- setMinimumPageSize(700, 500);
- }
- }
-
- protected boolean isEnabled(ISelection selection) {
- return Utilities.getResources(selection).length == 1;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.compare.internal.BaseCompareAction#run(org.eclipse.jface.viewers.ISelection)
- */
- protected void run(ISelection selection) {
- PatchWizard wizard= new PatchWizard(selection);
-
- if (areAllEditorsSaved()) {
- PatchWizardDialog dialog= new PatchWizardDialog(CompareUIPlugin.getShell(), wizard);
- dialog.open();
- }
- }
-
- private boolean areAllEditorsSaved(){
- if (CompareUIPlugin.getDirtyEditors().length == 0)
- return true;
- if (! saveAllDirtyEditors())
- return false;
- Shell shell= CompareUIPlugin.getShell();
- try {
- // Save isn't cancelable.
- IWorkspace workspace= ResourcesPlugin.getWorkspace();
- IWorkspaceDescription description= workspace.getDescription();
- boolean autoBuild= description.isAutoBuilding();
- description.setAutoBuilding(false);
- workspace.setDescription(description);
- try {
- new ProgressMonitorDialog(shell).run(false, false, createRunnable());
- } finally {
- description.setAutoBuilding(autoBuild);
- workspace.setDescription(description);
- }
- return true;
- } catch (InvocationTargetException e) {
- ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception);
- return false;
- } catch (CoreException e) {
- ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception);
- return false;
- } catch (InterruptedException e) {
- Assert.isTrue(false); // Can't happen. Operation isn't cancelable.
- return false;
- }
- }
-
- private IRunnableWithProgress createRunnable() {
- return new IRunnableWithProgress() {
- public void run(IProgressMonitor pm) {
- IEditorPart[] editorsToSave= CompareUIPlugin.getDirtyEditors();
- pm.beginTask(PatchMessages.PatchAction_SavingDirtyEditorsTask, editorsToSave.length);
- for (int i= 0; i < editorsToSave.length; i++) {
- editorsToSave[i].doSave(new SubProgressMonitor(pm, 1));
- pm.worked(1);
- }
- pm.done();
- }
- };
- }
-
- private boolean saveAllDirtyEditors() {
- if (ComparePreferencePage.getSaveAllEditors()) //must save everything
- return true;
- ListDialog dialog= new ListDialog(CompareUIPlugin.getShell()) {
- protected Control createDialogArea(Composite parent) {
- Composite result= (Composite) super.createDialogArea(parent);
- final Button check= new Button(result, SWT.CHECK);
- check.setText(PatchMessages.PatchAction_AlwaysSaveQuestion);
- check.setSelection(ComparePreferencePage.getSaveAllEditors());
- check.addSelectionListener(
- new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- ComparePreferencePage.setSaveAllEditors(check.getSelection());
- }
- }
- );
- applyDialogFont(result);
- return result;
- }
- };
- dialog.setTitle(PatchMessages.PatchAction_SaveAllQuestion);
- dialog.setAddCancelButton(true);
- dialog.setLabelProvider(createDialogLabelProvider());
- dialog.setMessage(PatchMessages.PatchAction_SaveAllDescription);
- dialog.setContentProvider(new ListContentProvider());
- dialog.setInput(Arrays.asList(CompareUIPlugin.getDirtyEditors()));
- return dialog.open() == Window.OK;
- }
-
- private ILabelProvider createDialogLabelProvider() {
- return new LabelProvider() {
- public Image getImage(Object element) {
- return ((IEditorPart) element).getTitleImage();
- }
- public String getText(Object element) {
- return ((IEditorPart) element).getTitle();
- }
- };
- }
-}
Index: compare/org/eclipse/compare/internal/patch/InputPatchPage.java
===================================================================
RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java,v
retrieving revision 1.26
diff -u -r1.26 InputPatchPage.java
--- compare/org/eclipse/compare/internal/patch/InputPatchPage.java 6 May 2005 19:03:14 -0000 1.26
+++ compare/org/eclipse/compare/internal/patch/InputPatchPage.java 8 Jun 2005 20:26:59 -0000
@@ -10,30 +10,58 @@
*******************************************************************************/
package org.eclipse.compare.internal.patch;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
import java.text.MessageFormat;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.*;
-
import org.eclipse.compare.internal.ICompareContextIds;
import org.eclipse.compare.internal.Utilities;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+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.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.model.WorkbenchContentProvider;
+import org.eclipse.ui.model.WorkbenchLabelProvider;
+import org.eclipse.ui.model.WorkbenchViewerSorter;
-/* package */ class InputPatchPage extends WizardPage {
+/* package */public class InputPatchPage extends WizardPage {
// constants
protected static final int SIZING_TEXT_FIELD_WIDTH= 250;
@@ -41,8 +69,8 @@
// dialog store id constants
private final static String PAGE_NAME= "PatchWizardPage1"; //$NON-NLS-1$
- private final static String STORE_PATCH_FILES_ID= PAGE_NAME + ".PATCH_FILES"; //$NON-NLS-1$
- private final static String STORE_USE_CLIPBOARD_ID= PAGE_NAME + ".USE_CLIPBOARD"; //$NON-NLS-1$
+ public final static String STORE_PATCH_FILES_ID= PAGE_NAME + ".PATCH_FILES"; //$NON-NLS-1$
+ public final static String STORE_USE_CLIPBOARD_ID= PAGE_NAME + ".USE_CLIPBOARD"; //$NON-NLS-1$
static final char SEPARATOR = System.getProperty ("file.separator").charAt (0); //$NON-NLS-1$
@@ -269,8 +297,11 @@
PatchWizard pw= (PatchWizard) getWizard();
IResource target= pw.getTarget();
- IWorkspace workspace= target.getWorkspace();
- IWorkspaceRoot root= workspace.getRoot();
+ IWorkspaceRoot root = null;
+ if (target != null) {
+ IWorkspace workspace= target.getWorkspace();
+ root= workspace.getRoot();
+ }
Tree tree= new Tree(parent, SWT.BORDER);
GridData gd= new GridData(GridData.FILL_BOTH);
Index: compare/org/eclipse/compare/internal/patch/PatchWizard.java
===================================================================
RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java,v
retrieving revision 1.22
diff -u -r1.22 PatchWizard.java
--- compare/org/eclipse/compare/internal/patch/PatchWizard.java 14 Apr 2005 13:53:03 -0000 1.22
+++ compare/org/eclipse/compare/internal/patch/PatchWizard.java 8 Jun 2005 20:26:59 -0000
@@ -25,10 +25,10 @@
import org.eclipse.compare.internal.*;
-/* package */ class PatchWizard extends Wizard {
+/* package */ public class PatchWizard extends Wizard {
// dialog store id constants
- private final static String DIALOG_SETTINGS_KEY= "PatchWizard"; //$NON-NLS-1$
+ public final static String DIALOG_SETTINGS_KEY= "PatchWizard"; //$NON-NLS-1$
private boolean fHasNewDialogSettings;
@@ -41,7 +41,7 @@
/*
* Creates a wizard for applying a patch file to the workspace.
*/
- /* package */ PatchWizard(ISelection selection) {
+ /* package */ public PatchWizard(ISelection selection) {
setDefaultPageImageDescriptor(CompareUIPlugin.getImageDescriptor("wizban/applypatch_wizban.gif")); //$NON-NLS-1$
setWindowTitle(PatchMessages.PatchWizard_title);
Index: compare/org/eclipse/compare/CompareWithPatchAction.java
===================================================================
RCS file: compare/org/eclipse/compare/CompareWithPatchAction.java
diff -N compare/org/eclipse/compare/CompareWithPatchAction.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ compare/org/eclipse/compare/CompareWithPatchAction.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 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.compare;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+
+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.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.util.Assert;
+import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.WizardDialog;
+
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.*;
+
+import org.eclipse.ui.IEditorPart;
+
+import org.eclipse.compare.internal.*;
+import org.eclipse.compare.internal.patch.PatchMessages;
+import org.eclipse.compare.internal.patch.PatchWizard;
+
+
+public class CompareWithPatchAction extends BaseCompareAction {
+
+ private PatchDialogSettings dialogSettings; //$NON-NLS-1$
+
+ static class PatchWizardDialog extends WizardDialog {
+
+ PatchWizardDialog(Shell parent, IWizard wizard) {
+ super(parent, wizard);
+
+ setShellStyle(getShellStyle() | SWT.RESIZE);
+ setMinimumPageSize(700, 500);
+ }
+ }
+
+ protected boolean isEnabled(ISelection selection) {
+ return Utilities.getResources(selection).length == 1;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.compare.internal.BaseCompareAction#run(org.eclipse.jface.viewers.ISelection)
+ */
+ protected void run(ISelection selection) {
+ PatchWizard wizard= new PatchWizard(selection);
+ wizard.setDialogSettings(dialogSettings);
+ if (areAllEditorsSaved()) {
+ PatchWizardDialog dialog= new PatchWizardDialog(CompareUIPlugin.getShell(), wizard);
+ dialog.open();
+ }
+ }
+
+ private boolean areAllEditorsSaved(){
+ if (CompareUIPlugin.getDirtyEditors().length == 0)
+ return true;
+ if (! saveAllDirtyEditors())
+ return false;
+ Shell shell= CompareUIPlugin.getShell();
+ try {
+ // Save isn't cancelable.
+ IWorkspace workspace= ResourcesPlugin.getWorkspace();
+ IWorkspaceDescription description= workspace.getDescription();
+ boolean autoBuild= description.isAutoBuilding();
+ description.setAutoBuilding(false);
+ workspace.setDescription(description);
+ try {
+ new ProgressMonitorDialog(shell).run(false, false, createRunnable());
+ } finally {
+ description.setAutoBuilding(autoBuild);
+ workspace.setDescription(description);
+ }
+ return true;
+ } catch (InvocationTargetException e) {
+ ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception);
+ return false;
+ } catch (CoreException e) {
+ ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception);
+ return false;
+ } catch (InterruptedException e) {
+ Assert.isTrue(false); // Can't happen. Operation isn't cancelable.
+ return false;
+ }
+ }
+
+ private IRunnableWithProgress createRunnable() {
+ return new IRunnableWithProgress() {
+ public void run(IProgressMonitor pm) {
+ IEditorPart[] editorsToSave= CompareUIPlugin.getDirtyEditors();
+ pm.beginTask(PatchMessages.PatchAction_SavingDirtyEditorsTask, editorsToSave.length);
+ for (int i= 0; i < editorsToSave.length; i++) {
+ editorsToSave[i].doSave(new SubProgressMonitor(pm, 1));
+ pm.worked(1);
+ }
+ pm.done();
+ }
+ };
+ }
+
+ private boolean saveAllDirtyEditors() {
+ if (ComparePreferencePage.getSaveAllEditors()) //must save everything
+ return true;
+ ListDialog dialog= new ListDialog(CompareUIPlugin.getShell()) {
+ protected Control createDialogArea(Composite parent) {
+ Composite result= (Composite) super.createDialogArea(parent);
+ final Button check= new Button(result, SWT.CHECK);
+ check.setText(PatchMessages.PatchAction_AlwaysSaveQuestion);
+ check.setSelection(ComparePreferencePage.getSaveAllEditors());
+ check.addSelectionListener(
+ new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ ComparePreferencePage.setSaveAllEditors(check.getSelection());
+ }
+ }
+ );
+ applyDialogFont(result);
+ return result;
+ }
+ };
+ dialog.setTitle(PatchMessages.PatchAction_SaveAllQuestion);
+ dialog.setAddCancelButton(true);
+ dialog.setLabelProvider(createDialogLabelProvider());
+ dialog.setMessage(PatchMessages.PatchAction_SaveAllDescription);
+ dialog.setContentProvider(new ListContentProvider());
+ dialog.setInput(Arrays.asList(CompareUIPlugin.getDirtyEditors()));
+ return dialog.open() == Window.OK;
+ }
+
+ private ILabelProvider createDialogLabelProvider() {
+ return new LabelProvider() {
+ public Image getImage(Object element) {
+ return ((IEditorPart) element).getTitleImage();
+ }
+ public String getText(Object element) {
+ return ((IEditorPart) element).getTitle();
+ }
+ };
+ }
+
+ public void setDialogSettings(PatchDialogSettings config) {
+ this.dialogSettings = config;
+ }
+}
Index: compare/org/eclipse/compare/PatchDialogSettings.java
===================================================================
RCS file: compare/org/eclipse/compare/PatchDialogSettings.java
diff -N compare/org/eclipse/compare/PatchDialogSettings.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ compare/org/eclipse/compare/PatchDialogSettings.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 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.compare;
+
+import org.eclipse.compare.internal.patch.InputPatchPage;
+import org.eclipse.compare.internal.patch.PatchWizard;
+import org.eclipse.jface.dialogs.DialogSettings;
+
+/**
+ * <code>CompareWithPatchConfiguration</code> represents a UI configuration
+ * for the <code>CompareWithPatchAction</code> wizard.
+ *
+ *
+ */
+public class PatchDialogSettings extends DialogSettings {
+
+ public PatchDialogSettings(String sectionName) {
+ super(sectionName);
+ }
+
+ public PatchDialogSettings() {
+ super(PatchWizard.DIALOG_SETTINGS_KEY);
+ }
+
+ public String getPatchPath() {
+ return this.get(InputPatchPage.STORE_PATCH_FILES_ID);
+ }
+ public void setPatchPath(String patchPath) {
+ this.put(InputPatchPage.STORE_PATCH_FILES_ID, patchPath);
+ }
+
+ public boolean isUseClipboard() {
+ return this.getBoolean(InputPatchPage.STORE_USE_CLIPBOARD_ID);
+ }
+ public void setUseClipboard(boolean useClipboard) {
+ this.put(InputPatchPage.STORE_USE_CLIPBOARD_ID, useClipboard);
+ }
+}
eclipse-swt-nocairo.fc4.patch:
features/org.eclipse.platform/build.properties | 6 +++---
features/org.eclipse.platform/build.xml | 3 ---
features/org.eclipse.rcp/build.properties | 6 +++---
features/org.eclipse.rcp/build.xml | 3 ---
plugins/org.eclipse.swt.gtk.linux.x86/build.xml | 4 ++--
plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml | 2 +-
plugins/org.eclipse.swt.motif.linux.x86/build.xml | 2 +-
7 files changed, 10 insertions(+), 16 deletions(-)
--- NEW FILE eclipse-swt-nocairo.fc4.patch ---
diff -uNr features/org.eclipse.platform/build.properties features/org.eclipse.platform/build.properties
--- features/org.eclipse.platform/build.properties 2005-06-27 11:17:29.000000000 -0400
+++ features/org.eclipse.platform/build.properties 2005-06-27 11:20:45.000000000 -0400
@@ -27,9 +27,9 @@
root.solaris.motif.sparc=../../features/org.eclipse.platform.launchers/bin/motif/solaris/sparc,motif
root.solaris.gtk.sparc=../../features/org.eclipse.platform.launchers/bin/gtk/solaris/sparc,gtk
-root.linux.gtk.x86=about_files/linux.gtk.x86,../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86,gtk,file:../../plugins/org.eclipse.swt.gtk.linux.x86/libcairo.so.1
+root.linux.gtk.x86=about_files/linux.gtk.x86,../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86,gtk
root.linux.gtk.x86.permissions.755=*.so*
-root.linux.gtk.x86_64=about_files/linux.gtk.x86_64,../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64,gtk,file:../../plugins/org.eclipse.swt.gtk.linux.x86_64/libcairo.so.1
+root.linux.gtk.x86_64=about_files/linux.gtk.x86_64,../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64,gtk
root.linux.gtk.x86_64.permissions.755=*.so*
root.linux.gtk.ppc=../../features/org.eclipse.platform.launchers/bin/gtk/linux/ppc,gtk
root.linux.gtk.ia64=../../features/org.eclipse.platform.launchers/bin/gtk/linux/ia64,gtk
@@ -38,7 +38,7 @@
# Need to be fixed to reflect eventual change into feature.xml
root.qnx.photon.x86=../../features/org.eclipse.platform.launchers/bin/photon/qnx/x86,win32
-root.linux.motif.x86=about_files/linux.motif.x86,motif,../../features/org.eclipse.platform.launchers/bin/motif/linux/x86,file:../../plugins/org.eclipse.swt.motif.linux.x86/libXm.so.2,motif,file:../../plugins/org.eclipse.swt.motif.linux.x86/libcairo.so.1
+root.linux.motif.x86=about_files/linux.motif.x86,motif,../../features/org.eclipse.platform.launchers/bin/motif/linux/x86,file:../../plugins/org.eclipse.swt.motif.linux.x86/libXm.so.2,motif
root.linux.motif.x86.permissions.755=*.so*
root.macosx.carbon.ppc=macosx.carbon,../../features/org.eclipse.platform.launchers/bin/carbon/macosx/ppc
diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
--- features/org.eclipse.platform/build.xml 2005-06-27 11:17:29.000000000 -0400
+++ features/org.eclipse.platform/build.xml 2005-06-27 11:21:10.000000000 -0400
@@ -365,7 +365,6 @@
<fileset dir="${basedir}/about_files/linux.gtk.x86" includes="**" />
<fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86" includes="**" />
<fileset dir="${basedir}/gtk" includes="**" />
- <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.linux.x86" includes="libcairo.so.1" />
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
@@ -398,7 +397,6 @@
<fileset dir="${basedir}/about_files/linux.gtk.x86_64" includes="**" />
<fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64" includes="**" />
<fileset dir="${basedir}/gtk" includes="**" />
- <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.linux.x86_64" includes="libcairo.so.1" />
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
@@ -423,7 +421,6 @@
<fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/motif/linux/x86" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.linux.x86" includes="libXm.so.2" />
<fileset dir="${basedir}/motif" includes="**" />
- <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.linux.x86" includes="libcairo.so.1" />
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
diff -uNr features/org.eclipse.rcp/build.properties features/org.eclipse.rcp/build.properties
--- features/org.eclipse.rcp/build.properties 2005-06-27 11:17:29.000000000 -0400
+++ features/org.eclipse.rcp/build.properties 2005-06-27 11:18:48.000000000 -0400
@@ -21,16 +21,16 @@
root.solaris.motif.sparc=../../features/org.eclipse.platform.launchers/bin/motif/solaris/sparc
-root.linux.gtk.x86=../../features/org.eclipse.platform/about_files/linux.gtk.x86,../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86,file:../../plugins/org.eclipse.swt.gtk.linux.x86/libcairo.so.1
+root.linux.gtk.x86=../../features/org.eclipse.platform/about_files/linux.gtk.x86,../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86
root.linux.gtk.x86.permissions.755=*.so*
root.linux.gtk.ppc=../../features/org.eclipse.platform.launchers/bin/gtk/linux/ppc
-root.linux.gtk.x86_64=../../features/org.eclipse.platform/about_files/linux.gtk.x86_64,../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64,file:../../plugins/org.eclipse.swt.gtk.linux.x86_64/libcairo.so.1
+root.linux.gtk.x86_64=../../features/org.eclipse.platform/about_files/linux.gtk.x86_64,../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64
root.linux.gtk.x86_64.permissions.755=*.so*
root.linux.gtk.ia64=../../features/org.eclipse.platform.launchers/bin/gtk/linux/ia64
# Need to be fixed to reflect eventual change into feature.xml
root.qnx.photon.x86=../../features/org.eclipse.platform.launchers/bin/photon/qnx/x86
-root.linux.motif.x86=../../features/org.eclipse.platform/about_files/linux.motif.x86,../../features/org.eclipse.platform.launchers/bin/motif/linux/x86,file:../../plugins/org.eclipse.swt.motif.linux.x86/libXm.so.2,file:../../plugins/org.eclipse.swt.motif.linux.x86/libcairo.so.1
+root.linux.motif.x86=../../features/org.eclipse.platform/about_files/linux.motif.x86,../../features/org.eclipse.platform.launchers/bin/motif/linux/x86,file:../../plugins/org.eclipse.swt.motif.linux.x86/libXm.so.2
root.linux.motif.x86.permissions.755=*.so*
root.macosx.carbon.ppc=macosx.carbon,../../features/org.eclipse.platform.launchers/bin/carbon/macosx/ppc
diff -uNr features/org.eclipse.rcp/build.xml features/org.eclipse.rcp/build.xml
--- features/org.eclipse.rcp/build.xml 2005-06-27 11:17:29.000000000 -0400
+++ features/org.eclipse.rcp/build.xml 2005-06-27 11:20:37.000000000 -0400
@@ -203,7 +203,6 @@
<copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true">
<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.x86" includes="**" />
<fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86" includes="**" />
- <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.linux.x86" includes="libcairo.so.1" />
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
@@ -235,7 +234,6 @@
<copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.x86_64" includes="**" />
<fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64" includes="**" />
- <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.linux.x86_64" includes="libcairo.so.1" />
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
@@ -259,7 +257,6 @@
<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.motif.x86" includes="**" />
<fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/motif/linux/x86" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.linux.x86" includes="libXm.so.2" />
- <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.linux.x86" includes="libcairo.so.1" />
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
diff -uNr plugins/org.eclipse.swt.gtk.linux.x86/build.xml plugins/org.eclipse.swt.gtk.linux.x86/build.xml
--- plugins/org.eclipse.swt.gtk.linux.x86/build.xml 2005-06-27 11:17:29.000000000 -0400
+++ plugins/org.eclipse.swt.gtk.linux.x86/build.xml 2005-06-27 11:22:28.000000000 -0400
@@ -201,7 +201,7 @@
<copy file="${plugindir}/build/.project" todir="${temp.folder}/swtdownload"/>
<copy file="${plugindir}/build/.classpath" todir="${temp.folder}/swtdownload"/>
<copy todir="${temp.folder}/swtdownload">
- <fileset dir="${basedir}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2,libcairo.so.1"/>
+ <fileset dir="${basedir}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2"/>
<fileset dir="${basedir}" includes="about.html,about_files/"/>
</copy>
<chmod dir="${temp.folder}/swtdownload" perm="755" includes="**/lib*"/>
@@ -240,4 +240,4 @@
<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
<delete dir="${temp.folder}"/>
</target>
-</project>
\ No newline at end of file
+</project>
diff -uNr plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
--- plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml 2005-06-27 11:17:29.000000000 -0400
+++ plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml 2005-06-27 11:22:37.000000000 -0400
@@ -277,7 +277,7 @@
<copy file="${plugindir}/build/.project" todir="${temp.folder}/swtdownload"/>
<copy file="${plugindir}/build/.classpath" todir="${temp.folder}/swtdownload"/>
<copy todir="${temp.folder}/swtdownload">
- <fileset dir="${basedir}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2,libcairo.so.1"/>
+ <fileset dir="${basedir}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2"/>
<fileset dir="${basedir}" includes="about.html,about_files/"/>
</copy>
<chmod dir="${temp.folder}/swtdownload" perm="755" includes="**/lib*"/>
--- plugins/org.eclipse.swt.motif.linux.x86/build.xml.orig 2005-06-27 11:32:35.000000000 -0400
+++ plugins/org.eclipse.swt.motif.linux.x86/build.xml 2005-06-27 11:32:40.000000000 -0400
@@ -211,7 +211,7 @@
<copy file="${plugindir}/build/.project" todir="${temp.folder}/swtdownload"/>
<copy file="${plugindir}/build/.classpath" todir="${temp.folder}/swtdownload"/>
<copy todir="${temp.folder}/swtdownload">
- <fileset dir="${basedir}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2,libcairo.so.1"/>
+ <fileset dir="${basedir}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2"/>
<fileset dir="${basedir}" includes="about.html,about_files/"/>
</copy>
<chmod dir="${temp.folder}/swtdownload" perm="755" includes="**/lib*"/>
eclipse-dontgeneratehelpindices.patch:
org.eclipse.jdt.doc.isv/buildDoc.xml | 8 ++++----
org.eclipse.jdt.doc.user/build.xml | 6 +++---
org.eclipse.pde.doc.user/buildDoc.xml | 8 ++++----
org.eclipse.platform.doc.isv/buildDoc.xml | 8 ++++----
org.eclipse.platform.doc.user/build.xml | 6 +++---
5 files changed, 18 insertions(+), 18 deletions(-)
Index: eclipse-dontgeneratehelpindices.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-dontgeneratehelpindices.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-dontgeneratehelpindices.patch 20 Jun 2005 21:14:00 -0000 1.1
+++ eclipse-dontgeneratehelpindices.patch 27 Jun 2005 19:38:29 -0000 1.2
@@ -1,6 +1,6 @@
-diff -uNr plugins.orig/org.eclipse.jdt.doc.isv/buildDoc.xml plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
---- plugins.orig/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-06-17 14:13:34.000000000 -0400
-+++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-06-17 14:14:28.000000000 -0400
+diff -uNr plugins/org.eclipse.jdt.doc.isv/buildDoc.xml plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
+--- plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-06-27 10:10:12.000000000 -0400
++++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-06-27 10:05:15.000000000 -0400
@@ -9,14 +9,14 @@
<antcall target="convertSchemaToHtml" />
<antcall target="examplesDocCopy" />
@@ -20,9 +20,9 @@
<target name="convertSchemaToHtml" if="eclipse.running">
<property name="dest" value="reference/extension-points" />
-diff -uNr plugins.orig/org.eclipse.jdt.doc.user/build.xml plugins/org.eclipse.jdt.doc.user/build.xml
---- plugins.orig/org.eclipse.jdt.doc.user/build.xml 2005-06-17 14:13:49.000000000 -0400
-+++ plugins/org.eclipse.jdt.doc.user/build.xml 2005-06-17 14:15:43.000000000 -0400
+diff -uNr plugins/org.eclipse.jdt.doc.user/build.xml plugins/org.eclipse.jdt.doc.user/build.xml
+--- plugins/org.eclipse.jdt.doc.user/build.xml 2005-06-27 10:28:29.000000000 -0400
++++ plugins/org.eclipse.jdt.doc.user/build.xml 2005-06-27 10:29:01.000000000 -0400
@@ -43,7 +43,7 @@
</target>
@@ -37,17 +37,16 @@
</target>
- <target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
-- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
++ <!--<target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
+ <help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
-+ <!--<target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">-->
-+ <!-- <help.buildHelpIndex manifest="plugin.xml" destination="."/>-->
-+ <!--</target>-->
++ </target>-->
<target name="build.sources" depends="init">
</target>
-diff -uNr plugins.orig/org.eclipse.pde.doc.user/buildDoc.xml plugins/org.eclipse.pde.doc.user/buildDoc.xml
---- plugins.orig/org.eclipse.pde.doc.user/buildDoc.xml 2005-06-17 14:13:34.000000000 -0400
-+++ plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-06-17 14:16:00.000000000 -0400
+diff -uNr plugins/org.eclipse.pde.doc.user/buildDoc.xml plugins/org.eclipse.pde.doc.user/buildDoc.xml
+--- plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-06-27 10:12:53.000000000 -0400
++++ plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-06-27 10:04:23.000000000 -0400
@@ -7,13 +7,13 @@
<target name="all" depends="init" unless="doc.zip.present">
<antcall target="convertSchemaToHtml" />
@@ -66,31 +65,31 @@
<target name="convertSchemaToHtml" if="eclipse.running">
<property name="dest" value="reference/extension-points" />
-diff -uNr plugins.orig/org.eclipse.platform.doc.isv/buildDoc.xml plugins/org.eclipse.platform.doc.isv/buildDoc.xml
---- plugins.orig/org.eclipse.platform.doc.isv/buildDoc.xml 2005-06-17 14:13:34.000000000 -0400
-+++ plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-06-17 14:17:09.000000000 -0400
+diff -uNr plugins/org.eclipse.platform.doc.isv/buildDoc.xml plugins/org.eclipse.platform.doc.isv/buildDoc.xml
+--- plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-06-27 10:12:57.000000000 -0400
++++ plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-06-27 10:09:23.000000000 -0400
@@ -8,14 +8,14 @@
- <antcall target="convertSchemaToHtml" />
- <antcall target="examplesDocCopy" />
- <antcall target="generateJavadoc" />
-- <antcall target="build.index" />
-+<!-- <antcall target="build.index" />-->
- <antcall target="createDocZip" />
- </target>
+ <antcall target="convertSchemaToHtml" />
+ <antcall target="examplesDocCopy" />
+ <antcall target="generateJavadoc" />
+- <antcall target="build.index" />
++<!-- <antcall target="build.index" />-->
+ <antcall target="createDocZip" />
+ </target>
--<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">
-- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
--</target>
-+<!--<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">-->
-+<!-- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>-->
-+<!--</target>-->
+- <target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">
+- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
+- </target>
++<!-- <target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">-->
++<!-- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>-->
++<!-- </target>-->
- <target name="convertSchemaToHtml" if="eclipse.running">
- <property name="dest" value="reference/extension-points" />
-diff -uNr plugins.orig/org.eclipse.platform.doc.user/build.xml plugins/org.eclipse.platform.doc.user/build.xml
---- plugins.orig/org.eclipse.platform.doc.user/build.xml 2005-06-17 14:13:49.000000000 -0400
-+++ plugins/org.eclipse.platform.doc.user/build.xml 2005-06-17 14:17:39.000000000 -0400
+ <target name="convertSchemaToHtml" if="eclipse.running">
+ <property name="dest" value="reference/extension-points" />
+diff -uNr plugins/org.eclipse.platform.doc.user/build.xml plugins/org.eclipse.platform.doc.user/build.xml
+--- plugins/org.eclipse.platform.doc.user/build.xml 2005-06-27 10:16:26.000000000 -0400
++++ plugins/org.eclipse.platform.doc.user/build.xml 2005-06-27 10:17:09.000000000 -0400
@@ -43,7 +43,7 @@
</target>
@@ -99,7 +98,7 @@
+ <!--<antcall target="build.index"/>-->
<zip zipfile="${plugin.destination}/doc.zip"
basedir="${plugin.destination}"
- includes="book.css, about.html, notices.html, cpy.png, no_help_exists.htm, concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**"
+ includes="book.css, about.html, notices.html, no_help_exists.htm, concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**"
@@ -53,9 +53,9 @@
<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.platform.doc.user.">
</target>
Index: eclipse-platform.install
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-platform.install,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-platform.install 21 Jun 2005 21:26:45 -0000 1.8
+++ eclipse-platform.install 27 Jun 2005 19:38:29 -0000 1.9
@@ -2,6 +2,8 @@
/usr/share/eclipse/epl-v10.html
/usr/share/eclipse/notice.html
/usr/share/eclipse/readme
+/usr/share/eclipse/about.html
+/usr/share/eclipse/about_files
/usr/share/eclipse/plugins/org.apache.ant_1.*
/usr/share/eclipse/plugins/org.apache.lucene_*
/usr/share/eclipse/plugins/org.eclipse.ant.core_3.*
eclipse-tomcat5-build.2.patch:
assemble.org.eclipse.sdk.aix.motif.ppc.xml | 2 +-
assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml | 2 +-
assemble.org.eclipse.sdk.hpux.motif.ia64.xml | 2 +-
assemble.org.eclipse.sdk.solaris.gtk.sparc.xml | 2 +-
assemble.org.eclipse.sdk.solaris.motif.sparc.xml | 2 +-
assemble.org.eclipse.sdk.win32.win32.x86.xml | 2 +-
features/org.eclipse.platform/build.xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
Index: eclipse-tomcat5-build.2.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat5-build.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-tomcat5-build.2.patch 21 Jun 2005 13:25:34 -0000 1.1
+++ eclipse-tomcat5-build.2.patch 27 Jun 2005 19:38:29 -0000 1.2
@@ -1,78 +1,78 @@
diff -uNr assemble.org.eclipse.sdk.aix.motif.ppc.xml assemble.org.eclipse.sdk.aix.motif.ppc.xml
---- assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-06-20 09:15:48.000000000 -0400
-+++ assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-06-20 09:16:17.000000000 -0400
-@@ -654,7 +654,7 @@
- <arg line="${pluginArchivePrefix}/org.eclipse.help.webapp_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.ui.browser_3.1.0.jar"/>
+--- assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-06-27 10:43:24.000000000 -0400
++++ assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-06-27 10:45:41.000000000 -0400
+@@ -617,7 +617,7 @@
+ <arg line="${pluginArchivePrefix}/org.apache.ant_1.6.5"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.help.ui_3.1.0.jar"/>
- </exec>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0"/>
diff -uNr assemble.org.eclipse.sdk.hpux.motif.ia64.xml assemble.org.eclipse.sdk.hpux.motif.ia64.xml
---- assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-06-20 09:15:48.000000000 -0400
-+++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-06-20 09:16:21.000000000 -0400
-@@ -639,7 +639,7 @@
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.core.boot_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.0.jar" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.ui.browser_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ui.browser_3.1.0.jar" />
- <zipfileset dir="${eclipse.base}/plugins/org.eclipse.platform.source.hpux.motif.ia64_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.platform.source.hpux.motif.ia64_3.1.0" />
+--- assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-06-27 10:43:24.000000000 -0400
++++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-06-27 10:46:02.000000000 -0400
+@@ -606,7 +606,7 @@
+ <zipfileset dir="${eclipse.base}/plugins/org.apache.ant_1.6.5" prefix="${pluginArchivePrefix}/org.apache.ant_1.6.5" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh2_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.osgi_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar" />
- <zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_4.1.30.1" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.0.30" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30" />
- <zipfileset dir="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh2_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.help.ui_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.ui_3.1.0.jar" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.pde_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.pde_3.1.0.jar" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.jdt_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.jdt.core_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.jdt.debug_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0" />
diff -uNr assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml
---- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-06-20 09:15:48.000000000 -0400
-+++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-06-20 09:16:23.000000000 -0400
-@@ -666,7 +666,7 @@
- <arg line="${pluginArchivePrefix}/org.eclipse.help.webapp_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.ui.browser_3.1.0.jar"/>
+--- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-06-27 10:43:24.000000000 -0400
++++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-06-27 10:46:36.000000000 -0400
+@@ -626,7 +626,7 @@
+ <arg line="${pluginArchivePrefix}/org.apache.ant_1.6.5"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0"/>
diff -uNr assemble.org.eclipse.sdk.solaris.gtk.sparc.xml assemble.org.eclipse.sdk.solaris.gtk.sparc.xml
---- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-06-20 09:15:48.000000000 -0400
-+++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-06-20 09:16:25.000000000 -0400
-@@ -654,7 +654,7 @@
- <arg line="${pluginArchivePrefix}/org.eclipse.help.webapp_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.ui.browser_3.1.0.jar"/>
+--- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-06-27 10:43:24.000000000 -0400
++++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-06-27 10:46:46.000000000 -0400
+@@ -616,7 +616,7 @@
+ <arg line="${pluginArchivePrefix}/org.apache.ant_1.6.5"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.help.ui_3.1.0.jar"/>
- </exec>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0"/>
diff -uNr assemble.org.eclipse.sdk.solaris.motif.sparc.xml assemble.org.eclipse.sdk.solaris.motif.sparc.xml
---- assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-06-20 09:15:48.000000000 -0400
-+++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-06-20 09:16:29.000000000 -0400
-@@ -655,7 +655,7 @@
- <arg line="${pluginArchivePrefix}/org.eclipse.help.webapp_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.ui.browser_3.1.0.jar"/>
+--- assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-06-27 10:43:24.000000000 -0400
++++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-06-27 10:47:00.000000000 -0400
+@@ -616,7 +616,7 @@
+ <arg line="${pluginArchivePrefix}/org.apache.ant_1.6.5"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0"/>
diff -uNr assemble.org.eclipse.sdk.win32.win32.x86.xml assemble.org.eclipse.sdk.win32.win32.x86.xml
---- assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-06-20 09:15:48.000000000 -0400
-+++ assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-06-20 09:16:33.000000000 -0400
-@@ -684,7 +684,7 @@
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+--- assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-06-27 10:43:24.000000000 -0400
++++ assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-06-27 10:47:12.000000000 -0400
+@@ -641,7 +641,7 @@
+ <arg line="${pluginArchivePrefix}/org.apache.ant_1.6.5"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.help.ui_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.pde_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0"/>
diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
---- features/org.eclipse.platform/build.xml 2005-06-20 09:16:03.000000000 -0400
-+++ features/org.eclipse.platform/build.xml 2005-06-20 09:19:24.000000000 -0400
+--- features/org.eclipse.platform/build.xml 2005-06-27 10:44:45.000000000 -0400
++++ features/org.eclipse.platform/build.xml 2005-06-27 10:43:41.000000000 -0400
@@ -346,7 +346,7 @@
<copy todir="${feature.base}/features/org.eclipse.platform_3.1.0" failonerror="true" overwrite="false">
<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" />
Index: eclipse.script
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.script,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- eclipse.script 20 May 2005 21:25:16 -0000 1.13
+++ eclipse.script 27 Jun 2005 19:38:29 -0000 1.14
@@ -37,7 +37,7 @@
# This makes the embedded browser work.
if [ -z "$MOZILLA_FIVE_HOME" ]; then
- XPCOM=$(ls -t /usr/lib/{mozilla,firefox}-*/libxpcom.so|head -n1)
+ XPCOM=$(ls -t /usr/lib/mozilla-*/libxpcom.so|head -n1)
export MOZILLA_FIVE_HOME=$(dirname $XPCOM)
fi
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- eclipse.spec 24 Jun 2005 20:45:32 -0000 1.155
+++ eclipse.spec 27 Jun 2005 19:38:29 -0000 1.156
@@ -12,7 +12,7 @@
%define eclipse_micro 0
%define eclipse_oldmajminmic 3.0.0
%define libname libswt3
-%define build_id S-3.1RC3-200506171618
+%define build_id S-3.1RC4-200506241300
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -24,11 +24,11 @@
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
-Release: 0.RC3.3
+Release: 0.RC4.1
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1RC3-200506171618/eclipse-sourceBuild-srcIncluded-3.1RC3.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1RC4-200506241300/eclipse-sourceBuild-srcIncluded-3.1RC4.zip
Source1: %{name}.script
Source2: %{name}.desktop
Source5: %{name}-48.png
@@ -68,8 +68,6 @@
#Patch13: %{name}-s390ands390x.patch
# Stupid spaces in directories ...
#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
@@ -94,6 +92,10 @@
Patch29: %{name}-tomcat5-build.patch
Patch30: %{name}-tomcat5-build.2.patch
Patch31: %{name}-webapp-tomcat5.patch
+# We don't have cairo in FC4
+Patch32: %{name}-swt-nocairo.fc4.patch
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707
+Patch33: %{name}-compare-create-api.patch
%if %{gcj_support}
ExclusiveArch: %{ix86} x86_64 ppc
@@ -127,7 +129,7 @@
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 tomcat5-jasper tomcat5-servlet-2.4-api
-#BuildRequires: lucene lucene-demo
+BuildRequires: lucene lucene-demo
BuildRequires: regexp
BuildRequires: junit >= 3.8.1-3jpp
%if %{gcj_support}
@@ -185,7 +187,7 @@
Requires: 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
Requires: mx4j >= 2.1
Requires: tomcat5 tomcat5-jasper tomcat5-servlet-2.4-api
-#Requires: lucene lucene-demo
+Requires: lucene lucene-demo
Requires: regexp
%description platform
@@ -297,10 +299,6 @@
%if %{gcj_support}
#%patch13 -p1
%endif
-pushd plugins/org.eclipse.platform.doc.isv
-rm -f activeHelpSample.jar
-%patch15 -p0
-popd
%if %{gcj_support}
#%patch16 -p0
%endif
@@ -328,6 +326,20 @@
pushd plugins/org.eclipse.help.webapp
%patch31 -p0
popd
+# Remove the pre-built cairo libraries
+pushd plugins/org.eclipse.swt.gtk.linux.x86
+rm libcairo.so.1
+popd
+pushd plugins/org.eclipse.swt.gtk.linux.x86_64
+rm libcairo.so.1
+popd
+pushd plugins/org.eclipse.swt.motif.linux.x86
+rm libcairo.so.1
+popd
+%patch32 -p0
+pushd plugins/org.eclipse.compare
+%patch32 -p0
+popd
%if %{gcj_support}
# Fedora splash screen.
@@ -403,11 +415,11 @@
##ln -sf %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant/lib/ant-xslp.jar
# ------------------------------------------------------------------------
## END ANT ##
-## BEGIN LUCENE ##
-#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
-## END LUCENE ##
-# =====>>>>>>>>>>>ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar
+# BEGIN LUCENE ##
+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
+# END LUCENE ##
+ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar
# ------------------------------------------------------------------------
## BEGIN TOMCAT ##
rm -f plugins/org.eclipse.tomcat/commons-beanutils.jar
@@ -715,7 +727,7 @@
# Add this directory to the files list for eclipse-platform
# This topmostDirs hack is needed due to differences in directory
# layout between the build system and regular machines
- topmostDirss=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
+ topmostDirs=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
if [ "$topmostDirs" = "var-tmp" ]; then
echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11"/"$12 }' >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
else
@@ -729,7 +741,7 @@
# Add this directory to the files list for eclipse-platform
# This topmostDirs hack is needed due to differences in directory
# layout between the build system and regular machines
- topmostDirss=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
+ topmostDirs=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
if [ "$topmostDirs" = "var-tmp" ]; then
echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11"/"$12 }' >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
else
@@ -852,8 +864,8 @@
#ln -sf %{_javadir}/ant/ant-xalan1.jar plugins/org.apache.ant_*/lib/ant-xalan1.jar
#ln -sf %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant_*/lib/ant-xslp.jar
## END ANT ##
-#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
+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
@@ -865,7 +877,7 @@
###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 TOMCAT ##
rm -f plugins/org.eclipse.tomcat_*/commons-beanutils.jar
@@ -1228,6 +1240,15 @@
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
%changelog
+* Sun Jun 26 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.RC4.1
+- Import 3.1 RC4.
+- Remove activeHelpSample.jar building patch as it's now fixed upstream.
+- Add patch to remove references to cairo since we don't have it in FC4.
+- Add about.html and about_files to eclipse-platform.install.
+- Add patch to create public compare API (jpound - e.o#98707).
+- Add patch from Robin Green to not look for firefox libxpcom.so (rh#161658).
+- Symlink lucene jars (rh#159939).
+
* Fri Jun 24 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.RC3.3
- Add rcp requirement for platform (rh#161267).
- Add un-owned osgi directories to libswt and platform.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 20 Jun 2005 21:35:40 -0000 1.25
+++ sources 27 Jun 2005 19:38:29 -0000 1.26
@@ -1,3 +1,3 @@
a51cad364164de7c3cd65bf48037a8f9 eclipse-native-splash-3.1-M7.png
60f8146948470d0ef7c275f26b874a31 ecj-M5.zip
-f395b390ee65e0afcd7d5615eb2ad5f4 eclipse-sourceBuild-srcIncluded-3.1RC3.zip
+a3e4871646cabf87948ea0f6225d6e49 eclipse-sourceBuild-srcIncluded-3.1RC4.zip
--- eclipse-tomcat5-build.2.m7.patch DELETED ---
--- eclipse-tomcat5-build.m7.patch DELETED ---
--- eclipse-tomcat5.m7.patch DELETED ---
More information about the fedora-cvs-commits
mailing list