- Add eclipse-rcp-devel as a requirement of eclipse-platform-devel
(rh#161267). - Updated splash screen (thanks to Diana Fong) (rh#170580). - Include and use rebuild-sdk-features (rh#173589). Fri Dec 02 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_8fc - Update EFJ patch (e.o#75333). - Update update-site-in-home-dir patch (e.o#90630) - bkonrath.
This commit is contained in:
parent
d279140982
commit
53a8732e17
@ -1,147 +0,0 @@
|
|||||||
diff -uNr src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java src.orig/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
|
|
||||||
--- src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java 2005-06-10 18:27:12.000000000 -0400
|
|
||||||
+++ src.orig/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java 2005-06-16 12:08:30.000000000 -0400
|
|
||||||
@@ -10,6 +10,7 @@
|
|
||||||
*******************************************************************************/
|
|
||||||
package org.eclipse.update.internal.ui.wizards;
|
|
||||||
|
|
||||||
+import org.eclipse.core.runtime.Platform;
|
|
||||||
import org.eclipse.jface.dialogs.Dialog;
|
|
||||||
import org.eclipse.jface.dialogs.IDialogSettings;
|
|
||||||
import org.eclipse.swt.SWT;
|
|
||||||
@@ -70,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);
|
|
||||||
diff -uNr src/org/eclipse/update/internal/ui/wizards/TargetPage.java src.orig/org/eclipse/update/internal/ui/wizards/TargetPage.java
|
|
||||||
--- src/org/eclipse/update/internal/ui/wizards/TargetPage.java 2005-06-10 18:29:01.000000000 -0400
|
|
||||||
+++ src.orig/org/eclipse/update/internal/ui/wizards/TargetPage.java 2005-06-16 12:09:05.000000000 -0400
|
|
||||||
@@ -10,25 +10,48 @@
|
|
||||||
*******************************************************************************/
|
|
||||||
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.core.runtime.Platform;
|
|
||||||
import org.eclipse.jface.dialogs.Dialog;
|
|
||||||
-import org.eclipse.jface.resource.*;
|
|
||||||
-import org.eclipse.jface.viewers.*;
|
|
||||||
+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.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.*;
|
|
||||||
-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.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.PlatformUI;
|
|
||||||
+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.UpdateUIMessages;
|
|
||||||
+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;
|
|
||||||
@@ -150,7 +173,7 @@
|
|
||||||
label.setLayoutData(gd);
|
|
||||||
|
|
||||||
installLocation = new Label(client, SWT.NULL);
|
|
||||||
- installLocation.setText("foo"); //$NON-NLS-1$
|
|
||||||
+ installLocation.setText("");
|
|
||||||
gd = new GridData(GridData.FILL_HORIZONTAL);
|
|
||||||
installLocation.setLayoutData(gd);
|
|
||||||
|
|
||||||
@@ -359,8 +382,28 @@
|
|
||||||
jobs[i].setTargetSite(defaultSite);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ IConfiguredSite csite = getFirstTargetSite(jobs[i]);
|
|
||||||
+ if (csite == null && Platform.getInstallLocation().isReadOnly()) {
|
|
||||||
+ // there are no updateable sites and the installation location is read only
|
|
||||||
+ // make an update site in the user's home direcotry
|
|
||||||
+ String sitePath = System.getProperty("user.home") + File.separator + ".eclipse" + File.separator +
|
|
||||||
+ Platform.getProduct().getId() + File.separator + "updates"; //$NON-NLS-1$ //$NON-NLS-2$
|
|
||||||
+
|
|
||||||
+ try {
|
|
||||||
+ csite = config.createConfiguredSite(new File(sitePath));
|
|
||||||
+ config.addConfiguredSite(csite);
|
|
||||||
+ IStatus status = csite.verifyUpdatableStatus();
|
|
||||||
+ if (!status.isOK())
|
|
||||||
+ throw new CoreException(status);
|
|
||||||
+
|
|
||||||
+ } catch (CoreException e) {
|
|
||||||
+ // there was a problem, the user must choose an installation site
|
|
||||||
+ csite = null;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- jobs[i].setTargetSite(getFirstTargetSite(jobs[i]));
|
|
||||||
+ jobs[i].setTargetSite(csite);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -370,7 +413,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;
|
|
58
eclipse.spec
58
eclipse.spec
@ -23,7 +23,7 @@ Epoch: 1
|
|||||||
Summary: %{pkg_summary}
|
Summary: %{pkg_summary}
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 1jpp_7fc
|
Release: 1jpp_8fc
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -36,13 +36,14 @@ Source7: %{name}-jdt.install
|
|||||||
Source8: %{name}-pde.install
|
Source8: %{name}-pde.install
|
||||||
Source9: %{name}-platform.install
|
Source9: %{name}-platform.install
|
||||||
Source10: %{libname}-gtk2.install
|
Source10: %{libname}-gtk2.install
|
||||||
Source11: %{name}-native-splash-3.1.png
|
Source11: %{name}-fedora-splash-3.1.1.png
|
||||||
Source16: %{name}-copy-platform.sh
|
Source16: %{name}-copy-platform.sh
|
||||||
Source17: %{name}-efj-wrapper.sh
|
Source17: %{name}-efj-wrapper.sh
|
||||||
# this zip was taken from the M6 source drop
|
# this zip was taken from the M6 source drop
|
||||||
Source18: ecj-M5.zip
|
Source18: ecj-M5.zip
|
||||||
Source19: %{name}-filenamepatterns.txt
|
Source19: %{name}-filenamepatterns.txt
|
||||||
Source20: ecj.sh.in
|
Source20: ecj.sh.in
|
||||||
|
Source21: rebuild-sdk-features
|
||||||
|
|
||||||
# Build libswt-mozilla and libswt-cairo and use O2
|
# Build libswt-mozilla and libswt-cairo and use O2
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
|
||||||
@ -78,7 +79,8 @@ Patch19: %{name}-efj.patch
|
|||||||
Patch20: %{name}-gnuformatterjdt.patch
|
Patch20: %{name}-gnuformatterjdt.patch
|
||||||
Patch21: %{name}-gnuformatterjdtui.patch
|
Patch21: %{name}-gnuformatterjdtui.patch
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630
|
||||||
Patch22: %{name}-updatehomedir.patch
|
Patch22: %{name}-updatehomedir-core.patch
|
||||||
|
Patch23: %{name}-updatehomedir-ui.patch
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
|
||||||
Patch24: %{name}-fileinitializer.patch
|
Patch24: %{name}-fileinitializer.patch
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=88364
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=88364
|
||||||
@ -219,6 +221,7 @@ former eclipse-gtk2 package).
|
|||||||
Summary: Eclipse platform Source
|
Summary: Eclipse platform Source
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: %{name}-rcp-devel = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description platform-devel
|
%description platform-devel
|
||||||
Source for Eclipse platform for use within Eclipse.
|
Source for Eclipse platform for use within Eclipse.
|
||||||
@ -336,9 +339,12 @@ popd
|
|||||||
pushd plugins/org.eclipse.jdt.ui
|
pushd plugins/org.eclipse.jdt.ui
|
||||||
#%patch21 -p0
|
#%patch21 -p0
|
||||||
popd
|
popd
|
||||||
pushd plugins/org.eclipse.update.ui
|
pushd plugins/org.eclipse.update.core
|
||||||
%patch22 -p0
|
%patch22 -p0
|
||||||
popd
|
popd
|
||||||
|
pushd plugins/org.eclipse.update.ui
|
||||||
|
%patch23 -p0
|
||||||
|
popd
|
||||||
pushd plugins/org.eclipse.core.runtime
|
pushd plugins/org.eclipse.core.runtime
|
||||||
%patch24 -p0
|
%patch24 -p0
|
||||||
popd
|
popd
|
||||||
@ -800,6 +806,11 @@ sed -e's/^\(.*\)$/\1 \1/' -e's,^,ln -s $eclipse/,' >> copy-platform
|
|||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
|
||||||
cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
|
cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
|
||||||
|
install -p -D -m0755 %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
|
||||||
|
sed --in-place "s:@SDK_VERSION@:%{version}:" \
|
||||||
|
$RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
|
||||||
|
sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" \
|
||||||
|
$RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
|
||||||
|
|
||||||
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
|
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||||
## BEGIN ANT ##
|
## BEGIN ANT ##
|
||||||
@ -911,13 +922,34 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%post jdt
|
%post jdt
|
||||||
%{_bindir}/rebuild-gcj-db
|
%{_bindir}/rebuild-gcj-db
|
||||||
|
if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
|
||||||
|
%{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
%post jdt-devel
|
||||||
|
if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
|
||||||
|
%{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
%post pde
|
%post pde
|
||||||
%{_bindir}/rebuild-gcj-db
|
%{_bindir}/rebuild-gcj-db
|
||||||
|
if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
|
||||||
|
%{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
%post pde-devel
|
||||||
|
if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
|
||||||
|
%{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
%post rcp
|
%post rcp
|
||||||
%{_bindir}/rebuild-gcj-db
|
%{_bindir}/rebuild-gcj-db
|
||||||
|
|
||||||
|
%post rcp-devel
|
||||||
|
if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
|
||||||
|
%{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
%post -n %{libname}-gtk2
|
%post -n %{libname}-gtk2
|
||||||
%{_bindir}/rebuild-gcj-db
|
%{_bindir}/rebuild-gcj-db
|
||||||
%endif
|
%endif
|
||||||
@ -926,11 +958,19 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
%{_bindir}/rebuild-gcj-db
|
%{_bindir}/rebuild-gcj-db
|
||||||
%endif
|
%endif
|
||||||
|
if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
|
||||||
|
%{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
|
||||||
|
fi
|
||||||
touch --no-create %{_datadir}/icons/hicolor
|
touch --no-create %{_datadir}/icons/hicolor
|
||||||
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||||
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
%post platform-devel
|
||||||
|
if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
|
||||||
|
%{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
%postun ecj
|
%postun ecj
|
||||||
%{_bindir}/rebuild-gcj-db
|
%{_bindir}/rebuild-gcj-db
|
||||||
@ -1200,6 +1240,16 @@ fi
|
|||||||
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
|
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 05 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_8fc
|
||||||
|
- Add eclipse-rcp-devel as a requirement of eclipse-platform-devel
|
||||||
|
(rh#161267).
|
||||||
|
- Updated splash screen (thanks to Diana Fong) (rh#170580).
|
||||||
|
- Include and use rebuild-sdk-features (rh#173589).
|
||||||
|
|
||||||
|
* Fri Dec 02 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_8fc
|
||||||
|
- Update EFJ patch (e.o#75333).
|
||||||
|
- Update update-site-in-home-dir patch (e.o#90630) - bkonrath.
|
||||||
|
|
||||||
* Tue Nov 15 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_7fc
|
* Tue Nov 15 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_7fc
|
||||||
- Disable ia64 and ppc64 for now (these seem to be upstream issues).
|
- Disable ia64 and ppc64 for now (these seem to be upstream issues).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user