diff --git a/eclipse-updatehomedir.patch b/eclipse-updatehomedir.patch index c2e96b2..b1edc47 100644 --- a/eclipse-updatehomedir.patch +++ b/eclipse-updatehomedir.patch @@ -1,11 +1,14 @@ +? @dot +? build.xml +? org.eclipse.update.ui_3.1.0.jar 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 18 Apr 2005 19:11:43 -0000 -@@ -10,24 +10,46 @@ ++++ 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; @@ -14,10 +17,9 @@ diff -u -r1.67 TargetPage.java +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.resource.*; -import org.eclipse.jface.viewers.*; @@ -68,7 +70,7 @@ diff -u -r1.67 TargetPage.java public class TargetPage extends BannerPage implements IDynamicPage { private TableViewer jobViewer; -@@ -149,7 +171,7 @@ +@@ -149,7 +170,7 @@ label.setLayoutData(gd); installLocation = new Label(client, SWT.NULL); @@ -77,13 +79,15 @@ diff -u -r1.67 TargetPage.java gd = new GridData(GridData.FILL_HORIZONTAL); installLocation.setLayoutData(gd); -@@ -363,7 +385,26 @@ +@@ -362,9 +383,27 @@ + jobs[i].setTargetSite(defaultSite); continue; } ++ ++ IConfiguredSite csite = getFirstTargetSite(jobs[i]); - jobs[i].setTargetSite(getFirstTargetSite(jobs[i])); -+ IConfiguredSite csite = getFirstTargetSite(jobs[i]); -+ +- + if (csite == null) { + // there are no updateable sites, make one in the user's home direcotry + String sitePath = System.getProperty("user.home") + File.separator + ".eclipse/updates"; //$NON-NLS-1$ //$NON-NLS-2$ @@ -102,6 +106,15 @@ diff -u -r1.67 TargetPage.java + } + + jobs[i].setTargetSite(csite); - } } + +@@ -373,7 +412,7 @@ + IConfiguredSite[] sites = config.getConfiguredSites(); + for (int i = 0; i < sites.length; i++) { + IConfiguredSite csite = sites[i]; +- if (getSiteVisibility(csite, job)) ++ if (getSiteVisibility(csite, job) && csite.verifyUpdatableStatus().isOK() == true) + return csite; + } + return null; diff --git a/eclipse.spec b/eclipse.spec index 03a5c96..651cdb8 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -23,7 +23,7 @@ ExclusiveArch: i386 x86_64 ppc Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 0.M6.7 +Release: 0.M6.8 License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1066,6 +1066,9 @@ fi %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0 %changelog +* Wed Apr 19 2005 Ben Konrath 3.1.0_fc-0.M6.8 +- Fix updatesite patch. + * Mon Apr 18 2005 Andrew Overholt 3.1.0_fc-0.M6.7 - Add %if %{gcj_support} blocks. - Add %{_libdir}/%{name}/plugins to native %files section of each sub-rpm.