rpms/eclipse/devel eclipse-updatehomedir-core.patch, NONE, 1.1 eclipse-updatehomedir-ui.patch, NONE, 1.1 rebuild-sdk-features, NONE, 1.1 eclipse-efj.patch, 1.1, 1.2 eclipse.spec, 1.203, 1.204 eclipse-updatehomedir.patch, 1.4, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Dec 6 20:05:58 UTC 2005
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29326
Modified Files:
eclipse-efj.patch eclipse.spec
Added Files:
eclipse-updatehomedir-core.patch
eclipse-updatehomedir-ui.patch rebuild-sdk-features
Removed Files:
eclipse-updatehomedir.patch
Log Message:
* Mon Dec 05 2005 Andrew Overholt <overholt at 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 at redhat.com> 3.1.1-1jpp_8fc
- Update EFJ patch (e.o#75333).
- Update update-site-in-home-dir patch (e.o#90630) - bkonrath.
eclipse-updatehomedir-core.patch:
internal/core/ConfiguredSite.java | 59 ++++++++++++++++-----
internal/operations/UpdateUtils.java | 35 ++++++++++++
internal/search/OptionalFeatureSearchCategory.java | 7 ++
internal/search/SiteSearchCategory.java | 7 ++
internal/search/UpdatesSearchCategory.java | 4 +
search/IUpdateSearchQuery.java | 9 +++
search/UpdateSearchRequest.java | 8 ++
7 files changed, 116 insertions(+), 13 deletions(-)
--- NEW FILE eclipse-updatehomedir-core.patch ---
? @dot
? build.xml
? org.eclipse.update.core_3.1.100.200511261349.jar
Index: src/org/eclipse/update/internal/core/ConfiguredSite.java
===================================================================
RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java,v
retrieving revision 1.95
diff -u -r1.95 ConfiguredSite.java
--- src/org/eclipse/update/internal/core/ConfiguredSite.java 15 Nov 2005 06:01:07 -0000 1.95
+++ src/org/eclipse/update/internal/core/ConfiguredSite.java 2 Dec 2005 06:18:34 -0000
@@ -11,18 +11,51 @@
package org.eclipse.update.internal.core;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.MissingResourceException;
+import java.util.PropertyResourceBundle;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.model.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.configurator.*;
+import org.eclipse.update.configuration.IActivity;
+import org.eclipse.update.configuration.IConfiguredSite;
+import org.eclipse.update.configuration.IConfiguredSiteChangedListener;
+import org.eclipse.update.configuration.IInstallConfiguration;
+import org.eclipse.update.configuration.IProblemHandler;
+import org.eclipse.update.configurator.ConfiguratorUtils;
+import org.eclipse.update.configurator.IPlatformConfiguration;
+import org.eclipse.update.core.IFeature;
+import org.eclipse.update.core.IFeatureReference;
+import org.eclipse.update.core.IIncludedFeatureReference;
+import org.eclipse.update.core.IPluginEntry;
+import org.eclipse.update.core.ISite;
+import org.eclipse.update.core.ISiteFeatureReference;
+import org.eclipse.update.core.IVerificationListener;
+import org.eclipse.update.core.SiteManager;
+import org.eclipse.update.core.Utilities;
+import org.eclipse.update.core.VersionedIdentifier;
+import org.eclipse.update.core.model.InstallAbortedException;
+import org.eclipse.update.internal.model.ConfiguredSiteModel;
+import org.eclipse.update.internal.operations.UpdateUtils;
/**
* A Configured site manages the Configured and unconfigured features of a Site
@@ -770,7 +803,9 @@
}
} else {
File container = getSiteContaining(file);
- if (container != null) {
+ // allow the install location to pass even though it looks like this
+ // site is contained in another site
+ if (container != null && !siteLocation.equals(Platform.getInstallLocation().getURL().getFile())) {
verifyStatus = createStatus(IStatus.ERROR, NLS.bind(Messages.ConfiguredSite_ContainedInAnotherSite, (new String[] { container.getAbsolutePath() })), null);
return verifyStatus;
}
Index: src/org/eclipse/update/internal/operations/UpdateUtils.java
===================================================================
RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UpdateUtils.java,v
retrieving revision 1.31
diff -u -r1.31 UpdateUtils.java
--- src/org/eclipse/update/internal/operations/UpdateUtils.java 12 Apr 2005 03:11:10 -0000 1.31
+++ src/org/eclipse/update/internal/operations/UpdateUtils.java 2 Dec 2005 06:18:34 -0000
@@ -40,6 +40,41 @@
private UpdateUtils() {
}
+ /**
+ * Verifies that the specified File is writable.
+ *
+ * @param file
+ * directory to check for writability; if a file is given, the
+ * parent directory will be checked
+ * @return returns <code>true</code> if the directory is writable,
+ * <code>false</code> otherwise
+ * @since 3.2
+ */
+ public static boolean canWrite(File file) {
+ if (!file.isDirectory() && file.getParentFile() != null) {
+ file = file.getParentFile();
+ }
+
+ File tryFile = null;
+ FileOutputStream out = null;
+ try {
+ tryFile = new File(file, "toDelete"); //$NON-NLS-1$
+ out = new FileOutputStream(tryFile);
+ out.write(0);
+ } catch (IOException e) {
+ return false;
+ } finally {
+ try {
+ if (out != null)
+ out.close();
+ } catch (IOException e) {
+ }
+ if (tryFile != null)
+ tryFile.delete();
+ }
+ return true;
+ }
+
public static String getPluginId() {
return UpdateCore.getPlugin().getBundle().getSymbolicName();
Index: src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java
===================================================================
RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java,v
retrieving revision 1.8
diff -u -r1.8 OptionalFeatureSearchCategory.java
--- src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java 1 Mar 2005 20:29:16 -0000 1.8
+++ src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java 2 Dec 2005 06:18:34 -0000
@@ -76,6 +76,13 @@
public IQueryUpdateSiteAdapter getQuerySearchSite() {
return null;
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.update.internal.ui.search.ISearchQuery#getFeature()
+ */
+ public IFeature getFeature() {
+ return null;
+ }
}
public void addVersionedIdentifier(VersionedIdentifier vid) {
Index: src/org/eclipse/update/internal/search/SiteSearchCategory.java
===================================================================
RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java,v
retrieving revision 1.10
diff -u -r1.10 SiteSearchCategory.java
--- src/org/eclipse/update/internal/search/SiteSearchCategory.java 23 Sep 2005 21:32:44 -0000 1.10
+++ src/org/eclipse/update/internal/search/SiteSearchCategory.java 2 Dec 2005 06:18:34 -0000
@@ -79,6 +79,13 @@
public IQueryUpdateSiteAdapter getQuerySearchSite() {
return null;
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.update.internal.ui.search.ISearchQuery#getFeature()
+ */
+ public IFeature getFeature() {
+ return null;
+ }
}
public SiteSearchCategory() {
Index: src/org/eclipse/update/internal/search/UpdatesSearchCategory.java
===================================================================
RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java,v
retrieving revision 1.26
diff -u -r1.26 UpdatesSearchCategory.java
--- src/org/eclipse/update/internal/search/UpdatesSearchCategory.java 23 May 2005 17:59:41 -0000 1.26
+++ src/org/eclipse/update/internal/search/UpdatesSearchCategory.java 2 Dec 2005 06:18:34 -0000
@@ -285,6 +285,10 @@
monitor.worked(1);
monitor.done();
}
+
+ public IFeature getFeature() {
+ return candidate;
+ }
}
private ArrayList candidates;
Index: src/org/eclipse/update/search/IUpdateSearchQuery.java
===================================================================
RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java,v
retrieving revision 1.8
diff -u -r1.8 IUpdateSearchQuery.java
--- src/org/eclipse/update/search/IUpdateSearchQuery.java 1 Mar 2005 20:29:16 -0000 1.8
+++ src/org/eclipse/update/search/IUpdateSearchQuery.java 2 Dec 2005 06:18:34 -0000
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Red Hat Incorporated - getFeature() API addition
*******************************************************************************/
package org.eclipse.update.search;
@@ -50,4 +51,12 @@
* @param monitor a progress monitor to report search progress within the provided site
*/
public void run(ISite site, String [] categoriesToSkip, IUpdateSearchFilter filter, IUpdateSearchResultCollector collector, IProgressMonitor monitor);
+
+/**
+ * Returns IFeature associated with the IUpdateSearchQuery
+ *
+ * @return the IFeature that is associated with the IUpdateSearchQuery
+ * @since 3.2
+ */
+ public IFeature getFeature();
}
Index: src/org/eclipse/update/search/UpdateSearchRequest.java
===================================================================
RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java,v
retrieving revision 1.26
diff -u -r1.26 UpdateSearchRequest.java
--- src/org/eclipse/update/search/UpdateSearchRequest.java 18 May 2005 22:48:27 -0000 1.26
+++ src/org/eclipse/update/search/UpdateSearchRequest.java 2 Dec 2005 06:18:35 -0000
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.update.search;
+import java.io.File;
import java.net.URL;
import java.util.ArrayList;
@@ -140,11 +141,11 @@
this.category = category;
this.scope = scope;
}
+
/**
* Returns the search catagory used in this request.
* @return the search category
*/
-
public IUpdateSearchCategory getCategory() {
return category;
}
@@ -242,6 +243,11 @@
// currently, the next conditional is only executed (qsite!=null) when
// running an update search.
if (qsite != null && searchFeatureProvidedSites) {
+ // do not update features that are installed in read-only locations
+ IFeature feature = query.getFeature();
+ if (feature != null &&
+ !feature.getSite().getCurrentConfiguredSite().verifyUpdatableStatus().isOK())
+ continue;
// check for mapping
IUpdateSiteAdapter mappedSite = getMappedSite(updatePolicy, qsite);
// when there is no mapped site the feature is not updatable
eclipse-updatehomedir-ui.patch:
InstallWizard2.java | 2 +-
TargetPage.java | 33 +++++++++++++++++++++++++++++----
2 files changed, 30 insertions(+), 5 deletions(-)
--- NEW FILE eclipse-updatehomedir-ui.patch ---
Index: src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java
===================================================================
RCS file: /home/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java,v
retrieving revision 1.7
diff -u -r1.7 InstallWizard2.java
--- src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java 15 Nov 2005 22:06:50 -0000 1.7
+++ src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java 2 Dec 2005 06:18:58 -0000
@@ -151,7 +151,7 @@
addPage(licensePage);
optionalFeaturesPage = new OptionalFeaturesPage(config);
addPage(optionalFeaturesPage);
- targetPage = new TargetPage(config);
+ targetPage = new TargetPage(config, isUpdate);
addPage(targetPage);
}
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.74
diff -u -r1.74 TargetPage.java
--- src/org/eclipse/update/internal/ui/wizards/TargetPage.java 21 Nov 2005 21:39:24 -0000 1.74
+++ src/org/eclipse/update/internal/ui/wizards/TargetPage.java 2 Dec 2005 06:18:59 -0000
@@ -13,6 +13,9 @@
import java.io.*;
import java.util.*;
+import org.eclipse.core.runtime.Platform;
+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.*;
@@ -41,6 +44,7 @@
private Label installLocation;
private Button changeLocation;
static HashSet added;
+ private boolean isUpdate; // whether the wizard is updating a feature or installing a new one
class JobsContentProvider
extends DefaultContentProvider
@@ -113,13 +117,14 @@
/**
* Constructor for ReviewPage2
*/
- public TargetPage(IInstallConfiguration config) {
+ public TargetPage(IInstallConfiguration config, boolean isUpdate) {
super("Target"); //$NON-NLS-1$
setTitle(UpdateUIMessages.InstallWizard_TargetPage_title);
setDescription(UpdateUIMessages.InstallWizard_TargetPage_desc);
this.config = config;
UpdateUI.getDefault().getLabelProvider().connect(this);
configListener = new ConfigListener();
+ this.isUpdate = isUpdate;
}
public void setJobs(IInstallFeatureOperation[] jobs) {
@@ -150,7 +155,7 @@
label.setLayoutData(gd);
installLocation = new Label(client, SWT.NULL);
- installLocation.setText("foo"); //$NON-NLS-1$
+ installLocation.setText(""); //$NON-NLS-1$
gd = new GridData(GridData.FILL_HORIZONTAL);
installLocation.setLayoutData(gd);
@@ -360,8 +365,27 @@
continue;
}
- jobs[i].setTargetSite(getFirstTargetSite(jobs[i]));
+ IConfiguredSite csite = getFirstTargetSite(jobs[i]);
+ if (csite == null && Platform.getInstallLocation().isReadOnly() && isUpdate == false) {
+ // there are no updateable sites, the installation location is read-only and we are installing a new feature
+ // make an update site in the user's home direcotry
+ String sitePath = System.getProperty("user.home") + File.separator + ".eclipse" + File.separator + //$NON-NLS-1$
+ Platform.getProduct().getId() + File.separator + "updates"; //$NON-NLS-1$
+
+ 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(csite);
}
}
@@ -370,7 +394,8 @@
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.getSite().getCurrentConfiguredSite().verifyUpdatableStatus().isOK())
return csite;
}
return null;
--- NEW FILE rebuild-sdk-features ---
#!/bin/sh
#
# Rebuild the features that are part of the SDK
#
# This script should be run in the %post section of the RPM installation for the
# following packages: eclipse-platform{,-devel}, eclipse-jdt{,-devel}, eclipse-pde{,-devel}
sdkVersion=@SDK_VERSION@
pushd /usr/share/eclipse
cp configuration/org.eclipse.update/platform.xml \
configuration/org.eclipse.update/platform.xml.bak
cp features/org.eclipse.sdk_${sdkVersion}/feature.xml \
features/org.eclipse.sdk_${sdkVersion}/feature.xml.bak
# platform.xml header, etc.
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > configuration/org.eclipse.update/platform.xml
echo "<config version=\"3.0\" date=\"1133364008091\" transient=\"false\">" >> configuration/org.eclipse.update/platform.xml
echo "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">" >> configuration/org.eclipse.update/platform.xml
featureId="org.eclipse.sdk"
version=${sdkVersion}
echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">" >> configuration/org.eclipse.update/platform.xml
echo "</feature>" >> configuration/org.eclipse.update/platform.xml
# sdk feature.xml header, etc.
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo "<feature" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " id=\"org.eclipse.sdk\"" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " label=\"%featureName\"" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " version=\"${sdkVersion}\"" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " image= \"eclipse_update_120.jpg\"" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " provider-name=\"%providerName\">" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " <description>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " %description" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " </description>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " " >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " <license url=\"%licenseURL\">" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " %license" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " </license>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " <url>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " <update label=\"%updateSiteName\" url=\"http://update.eclipse.org/updates/3.0\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " <discovery label=\"%updateSiteName\" url=\"http://update.eclipse.org/updates/3.0\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " </url>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
# Possible SDK features are:
# org.eclipse.jdt_${version}
# org.eclipse.pde_${version}
# org.eclipse.platform_${version}
# org.eclipse.platform.source_${version}
# org.eclipse.rcp_${version}
# org.eclipse.sdk_${version}
features=$(ls features)
for feature in $features
do
featureId=""
version=${feature: -5}
case $feature in
org.eclipse.rcp_*)
featureId="org.eclipse.rcp"
;;
org.eclipse.rcp.source_*)
featureId="org.eclipse.rcp.source"
;;
org.eclipse.platform_*)
featureId="org.eclipse.platform"
;;
org.eclipse.platform.source_*)
featureId="org.eclipse.platform.source"
;;
org.eclipse.jdt_*)
featureId="org.eclipse.jdt"
;;
org.eclipse.jdt.source_*)
featureId="org.eclipse.jdt.source"
;;
org.eclipse.pde_*)
featureId="org.eclipse.pde"
;;
org.eclipse.pde.source_*)
featureId="org.eclipse.pde.source"
;;
esac
if [ "xx${featureId}xx" != "xxxx" ]
then
if [ "xx${version}xx" != "xxxx" ]
then
echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">" >> configuration/org.eclipse.update/platform.xml
echo "</feature>" >> configuration/org.eclipse.update/platform.xml
if [ "xx${featureId}" != "xxorg.eclipse.rcp" ]
then
echo " <includes id=\""${featureId}"\" version=\""${version}"\" />" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
fi
fi
fi
done
# platform.xml footer
echo "</site>" >> configuration/org.eclipse.update/platform.xml
echo "</config>" >> configuration/org.eclipse.update/platform.xml
# sdk feature.xml footer
echo " <plugin id=\"org.eclipse.sdk\" version=\"${sdkVersion}\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo " " >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
echo "</feature>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
popd
eclipse-efj.patch:
formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java | 2
formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java | 427 ++++++++++
formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties | 47 +
plugin.xml | 11
4 files changed, 486 insertions(+), 1 deletion(-)
Index: eclipse-efj.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-efj.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-efj.patch 6 Apr 2005 21:47:54 -0000 1.1
+++ eclipse-efj.patch 6 Dec 2005 20:05:39 -0000 1.2
@@ -205,7 +205,7 @@
+ * not require org.eclipse.jdt.ui (nor should it). Refactoring this to make
+ * it an external class of org.eclipse.jdt.core would solve these problems.
+ */
-+ int CURRENT_VERSION = 6;
++ int CURRENT_VERSION = 8;
+
+ /**
+ * Read the xml config file and return a Map representing the options that
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- eclipse.spec 15 Nov 2005 16:48:12 -0000 1.203
+++ eclipse.spec 6 Dec 2005 20:05:39 -0000 1.204
@@ -23,7 +23,7 @@
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 1jpp_7fc
+Release: 1jpp_8fc
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -36,13 +36,14 @@
Source8: %{name}-pde.install
Source9: %{name}-platform.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
Source17: %{name}-efj-wrapper.sh
# this zip was taken from the M6 source drop
Source18: ecj-M5.zip
Source19: %{name}-filenamepatterns.txt
Source20: ecj.sh.in
+Source21: rebuild-sdk-features
# Build libswt-mozilla and libswt-cairo and use O2
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
@@ -78,7 +79,8 @@
Patch20: %{name}-gnuformatterjdt.patch
Patch21: %{name}-gnuformatterjdtui.patch
# 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
Patch24: %{name}-fileinitializer.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=88364
@@ -219,6 +221,7 @@
Summary: Eclipse platform Source
Group: Text Editors/Integrated Development Environments (IDE)
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
+Requires: %{name}-rcp-devel = %{epoch}:%{version}-%{release}
%description platform-devel
Source for Eclipse platform for use within Eclipse.
@@ -336,9 +339,12 @@
pushd plugins/org.eclipse.jdt.ui
#%patch21 -p0
popd
-pushd plugins/org.eclipse.update.ui
+pushd plugins/org.eclipse.update.core
%patch22 -p0
popd
+pushd plugins/org.eclipse.update.ui
+%patch23 -p0
+popd
pushd plugins/org.eclipse.core.runtime
%patch24 -p0
popd
@@ -800,6 +806,11 @@
mkdir -p $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}
## BEGIN ANT ##
@@ -911,13 +922,34 @@
%post jdt
%{_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
%{_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
%{_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
%{_bindir}/rebuild-gcj-db
%endif
@@ -926,11 +958,19 @@
%if %{gcj_support}
%{_bindir}/rebuild-gcj-db
%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
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
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}
%postun ecj
%{_bindir}/rebuild-gcj-db
@@ -1200,6 +1240,16 @@
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
%changelog
+* Mon Dec 05 2005 Andrew Overholt <overholt at 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 at 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 at redhat.com> 3.1.1-1jpp_7fc
- Disable ia64 and ppc64 for now (these seem to be upstream issues).
--- eclipse-updatehomedir.patch DELETED ---
More information about the fedora-cvs-commits
mailing list