rpms/eclipse/F-7 eclipse-add-ppc64-sparc64-s390-s390x.patch, 1.4, 1.5 eclipse.spec, 1.429, 1.430
Ben Konrath (bkonrath)
fedora-extras-commits at redhat.com
Mon Jul 16 21:32:20 UTC 2007
Author: bkonrath
Update of /cvs/pkgs/rpms/eclipse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21248
Modified Files:
eclipse-add-ppc64-sparc64-s390-s390x.patch eclipse.spec
Log Message:
* Mon Jul 16 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-16
- Add alpha support.
- Resolves: #248359.
eclipse-add-ppc64-sparc64-s390-s390x.patch:
Index: eclipse-add-ppc64-sparc64-s390-s390x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-7/eclipse-add-ppc64-sparc64-s390-s390x.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-add-ppc64-sparc64-s390-s390x.patch 21 Feb 2007 18:52:38 -0000 1.4
+++ eclipse-add-ppc64-sparc64-s390-s390x.patch 16 Jul 2007 21:32:18 -0000 1.5
@@ -5,7 +5,7 @@
diff -u -r1.106 Platform.java
--- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 13 Apr 2006 00:42:47 -0000 1.106
+++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 31 Jan 2007 21:33:51 -0000
-@@ -339,6 +339,11 @@
+@@ -339,6 +339,12 @@
* @since 3.1
*/
public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
@@ -14,6 +14,7 @@
+ public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$
+ public static final String ARCH_S390 = "s390";//$NON-NLS-1$
+ public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
++ public static final String ARCH_ALPHA = "alpha";//$NON-NLS-1$
/**
* Constant string (value "win32") indicating the platform is running on a
@@ -24,7 +25,7 @@
diff -u -r1.253 InternalPlatform.java
--- plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 21 Apr 2006 20:49:57 -0000 1.253
+++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 31 Jan 2007 21:33:50 -0000
-@@ -52,6 +52,10 @@
+@@ -52,6 +52,11 @@
Platform.ARCH_X86, //
Platform.ARCH_AMD64, //
Platform.ARCH_IA64, //
@@ -32,6 +33,7 @@
+ Platform.ARCH_SPARC64, //
+ Platform.ARCH_S390, //
+ Platform.ARCH_S390X, //
++ Platform.ARCH_ALPHA, //
Platform.ARCH_IA64_32};
private static final String BOOT = "-boot"; //$NON-NLS-1$
private static final String CLASSLOADER_PROPERTIES = "-classloaderProperties"; //$NON-NLS-1$
@@ -47,7 +49,7 @@
private static final String PLUGIN_PROPERTIES_FILENAME = "plugin"; //$NON-NLS-1$
private static PluginConverterImpl instance;
- private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64};
-+ private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64, org.eclipse.osgi.service.environment.Constants.ARCH_PPC64, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC64, org.eclipse.osgi.service.environment.Constants.ARCH_S390, org.eclipse.osgi.service.environment.Constants.ARCH_S390X};
++ private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64, org.eclipse.osgi.service.environment.Constants.ARCH_PPC64, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC64, org.eclipse.osgi.service.environment.Constants.ARCH_S390, org.eclipse.osgi.service.environment.Constants.ARCH_S390X, org.eclipse.osgi.service.environment.Constants.ARCH_ALPHA};
static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$
static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$
static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
@@ -58,7 +60,7 @@
diff -u -r1.9 Constants.java
--- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 13 Jun 2005 17:14:22 -0000 1.9
+++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 31 Jan 2007 21:33:52 -0000
-@@ -119,6 +119,11 @@
+@@ -119,6 +119,12 @@
*/
public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
@@ -66,6 +68,7 @@
+ public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$
+ public static final String ARCH_S390 = "s390";//$NON-NLS-1$
+ public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
++ public static final String ARCH_ALPHA = "alpha";//$NON-NLS-1$
+
/**
* Constant string (value "win32") indicating the platform is running on a
@@ -77,7 +80,7 @@
diff -u -r1.40.2.1 feature.xml
--- features/org.eclipse.rcp/feature.xml 1 Aug 2006 17:29:33 -0000 1.40.2.1
+++ features/org.eclipse.rcp/feature.xml 6 Feb 2007 23:44:22 -0000
-@@ -308,5 +308,60 @@
+@@ -308,5 +308,71 @@
install-size="0"
version="0.0.0"
unpack="false"/>
@@ -136,12 +139,23 @@
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.alpha"
++ os="linux"
++ ws="gtk"
++ arch="alpha"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
</feature>
diff -ru features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
--- features/org.eclipse.platform.source/feature.xml 2007-02-06 19:04:05.000000000 -0500
+++ features/org.eclipse.platform.source/feature.xml 2007-02-06 19:07:26.000000000 -0500
-@@ -28,4 +28,8 @@
+@@ -28,4 +28,9 @@
<plugin ws="gtk" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
<plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
<plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
@@ -149,11 +163,12 @@
+ <plugin ws="gtk" os="linux" fragment="true" arch="s390x" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390x" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc64" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="alpha" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.alpha" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
</feature>
diff -ru features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
--- features/org.eclipse.rcp.source/feature.xml 2007-02-06 19:04:06.000000000 -0500
+++ features/org.eclipse.rcp.source/feature.xml 2007-02-06 19:09:11.000000000 -0500
-@@ -28,4 +28,9 @@
+@@ -28,4 +28,10 @@
<plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.win32.win32.x86" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
<plugin ws="motif" os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
<plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
@@ -162,4 +177,5 @@
+ <plugin ws="gtk" os="linux" fragment="true" arch="s390x" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390x" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="alpha" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.alpha" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
</feature>
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-7/eclipse.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- eclipse.spec 19 Jun 2007 19:14:40 -0000 1.429
+++ eclipse.spec 16 Jul 2007 21:32:18 -0000 1.430
@@ -18,7 +18,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 15%{?dist}
+Release: 16%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -666,7 +666,7 @@
assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
features/org.eclipse.rcp/build.xml
-## Nasty hack to get suppport for ppc64, s390{,x} and sparc{,64}
+## Nasty hack to get suppport for ppc64, s390{,x}, sparc{,64} and alpha
%patch24 -p0
# there is only partial support for ppc64 in 3.2 so we have to remove this
# partial support to get the replacemnt hack to work
@@ -678,9 +678,9 @@
sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml
# replace final occurances with an existing arch
sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
-# Move all of the ia64 directories to ppc64 or s390{,x} or sparc{,64} dirs and replace
+# Move all of the ia64 directories to ppc64 or s390{,x} or sparc{,64} or alpha dirs and replace
# the ia64 strings with ppc64 or s390(x)
-%ifarch ppc64 s390 s390x sparc sparc64
+%ifarch ppc64 s390 s390x sparc sparc64 alpha
for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do
mv $f $(echo $f | sed "s/ia64/%{_arch}/")
done
@@ -1722,6 +1722,10 @@
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
+* Mon Jul 16 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-16
+- Add alpha support.
+- Resolves: #248359.
+
* Tue Jun 20 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-15
- Add Java-1.7.profile to org.eclipse.osgi for IcedTea.
More information about the fedora-extras-commits
mailing list