rpms/eclipse/devel eclipse-updatehomedir.patch, 1.1, 1.2 eclipse.spec, 1.106, 1.107

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	eclipse-updatehomedir.patch eclipse.spec 
Log Message:
- Fix updatesite patch.


eclipse-updatehomedir.patch:
 TargetPage.java |   79 +++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 59 insertions(+), 20 deletions(-)

Index: eclipse-updatehomedir.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-updatehomedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-updatehomedir.patch	20 Apr 2005 02:44:10 -0000	1.1
+++ eclipse-updatehomedir.patch	20 Apr 2005 16:48:00 -0000	1.2
@@ -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 @@
 +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 @@
  
  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 @@
          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 @@
 +			}
 +			
 +			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;


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- eclipse.spec	20 Apr 2005 02:44:10 -0000	1.106
+++ eclipse.spec	20 Apr 2005 16:48:00 -0000	1.107
@@ -23,7 +23,7 @@
 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 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Wed Apr 19 2005 Ben Konrath <bkonrath at redhat.com> 3.1.0_fc-0.M6.8
+- Fix updatesite patch.
+
 * Mon Apr 18 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.M6.7
 - Add %if %{gcj_support} blocks.
 - Add %{_libdir}/%{name}/plugins to native %files section of each sub-rpm.