From 0827087448f0268bcf9c01e658b24e56c4ff2cc4 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtakov@fedoraproject.org>
Date: Nov 17 2009 12:34:31 +0000
Subject: Fix ppc64 swt version.


---

diff --git a/.cvsignore b/.cvsignore
index 31753a2..5f0efac 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ eclipse-build-R0_3_0.tar.gz
 ecf-filetransfer-v20090604-1131.tar.bz2
 eclipse-R3_5_1-fetched-src.tar.bz2
 eclipse-build-0.4.0RC0.tar.gz
+eclipse-build-0_4_RC4.tar.gz
diff --git a/eclipse-add-ppc64-filesystem.patch b/eclipse-add-ppc64-filesystem.patch
deleted file mode 100644
index 5d77ce1..0000000
--- a/eclipse-add-ppc64-filesystem.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./features/org.eclipse.platform/feature.xml	2009-08-07 18:30:54.000000000 +0300
-+++ ./features/org.eclipse.platform/feature.xml	2009-08-07 18:50:29.043863537 +0300
-@@ -440,6 +440,16 @@
-          version="0.0.0"
-          fragment="true"
-          unpack="false"/>
-+	 
-+   <plugin
-+         id="org.eclipse.core.filesystem.linux.ppc64"
-+         os="linux"
-+         arch="ppc64"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
- 
-    <plugin
-          id="org.eclipse.core.filesystem.linux.x86"
diff --git a/eclipse-add-ppc64-sparc64-s390-s390x-2.patch b/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
deleted file mode 100644
index 9ffc83d..0000000
--- a/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./features/org.eclipse.rcp/feature.xml.arches ./features/org.eclipse.rcp/feature.xml
---- ./features/org.eclipse.rcp/feature.xml.arches	2008-10-03 09:05:02.000000000 -0400
-+++ ./features/org.eclipse.rcp/feature.xml	2008-10-03 09:06:45.000000000 -0400
-@@ -229,6 +229,20 @@
-          unpack="false"/>
- 
-    <plugin
-+         id="org.eclipse.swt.gtk.linux.ppc64"
-+         os="linux"
-+         ws="gtk"
-+         arch="ppc64"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
-+
-+
-+
-+
-+   <plugin
-          id="org.eclipse.swt.gtk.solaris.sparc"
-          os="solaris"
-          ws="gtk"
diff --git a/eclipse-add-ppc64-sparc64-s390-s390x.patch b/eclipse-add-ppc64-sparc64-s390-s390x.patch
deleted file mode 100644
index 3a2c701..0000000
--- a/eclipse-add-ppc64-sparc64-s390-s390x.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
---- eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	2007-06-25 15:57:02.000000000 -0400
-+++ eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	2007-07-16 16:08:02.000000000 -0400
-@@ -47,6 +47,11 @@
- 			Platform.ARCH_X86, //
- 			Platform.ARCH_AMD64, // 
- 			Platform.ARCH_IA64, //
-+			Platform.ARCH_PPC64, //
-+			Platform.ARCH_SPARC64, //
-+			Platform.ARCH_S390, //
-+			Platform.ARCH_S390X, //
-+			Platform.ARCH_ALPHA, //
- 			Platform.ARCH_IA64_32};
- 
- 	// debug support:  set in loadOptions()
-Only in eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime: InternalPlatform.java.orig
-diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
---- eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	2007-06-25 15:57:18.000000000 -0400
-+++ eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	2007-07-16 16:08:02.000000000 -0400
-@@ -346,6 +346,12 @@
- 	 * @since 3.1
- 	 */
- 	public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
-+	
-+	public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$
-+	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
-Only in eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime: Platform.java.orig
-diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java eclipse-3.3-src/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
---- eclipse-3.3-src.orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java	2007-06-25 15:57:06.000000000 -0400
-+++ eclipse-3.3-src/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java	2007-07-16 16:08:02.000000000 -0400
-@@ -64,7 +64,7 @@
- 	private static final String MANIFEST_VERSION = "Manifest-Version"; //$NON-NLS-1$
- 	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, 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$
-diff -ru eclipse-3.4-src.orig/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java eclipse-3.4-src/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
---- eclipse-3.4-src.orig/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java.orig	2008-07-22 08:37:14.000000000 -0400
-+++ eclipse-3.4-src/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java	2008-07-22 08:38:02.000000000 -0400
-@@ -131,6 +131,12 @@
- 	 */
- 	public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
- 
-+	public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$
-+	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
- 	 * machine using the Windows windowing system.
diff --git a/eclipse-addusrsharedropins.patch b/eclipse-addusrsharedropins.patch
deleted file mode 100644
index 125f0ea..0000000
--- a/eclipse-addusrsharedropins.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.orig	2009-10-05 10:29:14.349001858 +0300
-+++ buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product	2009-10-05 10:46:26.812754089 +0300
-@@ -8,7 +8,7 @@
- 
-    <launcherArgs>
-       <programArgs>-showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m</programArgs>
--      <vmArgs>-Xms40m -Xmx256m</vmArgs>
-+      <vmArgs>-Xms40m -Xmx512m -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins</vmArgs>
-       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-    </launcherArgs>
- 
diff --git a/eclipse-swt-ppc64-version.patch b/eclipse-swt-ppc64-version.patch
new file mode 100644
index 0000000..fd821ae
--- /dev/null
+++ b/eclipse-swt-ppc64-version.patch
@@ -0,0 +1,10 @@
+--- pluginVersions.properties.orig	2009-11-17 14:14:23.347601483 +0200
++++ pluginVersions.properties	2009-11-17 14:15:06.718811108 +0200
+@@ -175,6 +175,7 @@ org.eclipse.core.databinding.property,0.
+ org.eclipse.ui.examples.propertysheet,0.0.0=I20070319-0010
+ org.eclipse.core.jobs,0.0.0=v20090429-1800
+ org.eclipse.swt.gtk.linux.ppc,0.0.0=v3555a
++org.eclipse.swt.gtk.linux.ppc64,0.0.0=v3555a
+ org.eclipse.swt.carbon.macosx,0.0.0=v3555a
+ org.eclipse.jdt.ui.examples.projects,0.0.0=v20090603
+ org.eclipse.pde.runtime,0.0.0=v20090731
diff --git a/eclipse.spec b/eclipse.spec
index f0f85e3..4124478 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        19%{?dist}
+Release:        20%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -45,6 +45,8 @@ Source28:       %{name}-mv-Platform.sh
 # correct location for source bundles (see RHBZ # 521969). This does not
 # need to go upstream.
 Patch0:        %{name}-target-platform-template.patch
+# make o.e.swt.gtk.linux.ppc64 version to match ppc 
+Patch1:        %{name}-swt-ppc64-version.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -384,6 +386,8 @@ fi
 
 # target platform template patch
 %patch0 -p0
+# make o.e.swt.gtk.linux.ppc64 version to match ppc 
+%patch1
 popd
 
 %build
@@ -1100,6 +1104,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Nov 17 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.1-20
+- Fix ppc64 swt jar version.
+
 * Mon Nov 16 2009 Andrew Overholt <overholt@redhat.com> 1:3.5.1-19
 - Merge fixes from rawhide.
 - Fixes rh#537536.