diff --git a/eclipse-add-ppc64-sparc64-s390-s390x-2.patch b/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
index 471b8df..a1ce890 100644
--- a/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
+++ b/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
@@ -1,33 +1,31 @@
-diff -ur features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
---- features/org.eclipse.platform.source/feature.xml 2008-04-03 11:07:23.000000000 -0400
-+++ features/org.eclipse.platform.source/feature.xml 2008-04-03 11:13:00.000000000 -0400
-@@ -42,4 +42,7 @@
-
-
-
-+
-+
-+
-
-diff -ur features/org.eclipse.rcp/feature.xml features/org.eclipse.rcp/feature.xml
---- features/org.eclipse.rcp/feature.xml 2008-04-03 11:16:49.000000000 -0400
-+++ features/org.eclipse.rcp/feature.xml 2008-04-03 11:07:23.000000000 -0400
-@@ -499,4 +499,48 @@
+diff -up ./features/org.eclipse.platform.source/feature.xml.arches ./features/org.eclipse.platform.source/feature.xml
+diff -up ./features/org.eclipse.rcp/feature.xml.arches ./features/org.eclipse.rcp/feature.xml
+--- ./features/org.eclipse.rcp/feature.xml.arches 2008-07-22 08:41:03.000000000 -0400
++++ ./features/org.eclipse.rcp/feature.xml 2008-07-22 08:44:33.000000000 -0400
+@@ -227,7 +227,17 @@
version="0.0.0"
- fragment="true"/>
+ fragment="true"
+ unpack="false"/>
+-
++
++
+
+
-+
-+
+
-
-diff -ur features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
---- features/org.eclipse.rcp.source/feature.xml 2008-04-03 11:07:23.000000000 -0400
-+++ features/org.eclipse.rcp.source/feature.xml 2008-04-03 11:17:54.000000000 -0400
-@@ -30,4 +30,8 @@
-
-
-
-+
-+
-+
-+
-
+
+
+
++
++
++
++
+
+
+
diff --git a/eclipse-add-ppc64-sparc64-s390-s390x.patch b/eclipse-add-ppc64-sparc64-s390-s390x.patch
index 82f0e0b..3a2c701 100644
--- a/eclipse-add-ppc64-sparc64-s390-s390x.patch
+++ b/eclipse-add-ppc64-sparc64-s390-s390x.patch
@@ -43,10 +43,10 @@ diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/ec
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.3-src.orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java eclipse-3.3-src/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java
---- eclipse-3.3-src.orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 2007-06-25 15:57:02.000000000 -0400
-+++ eclipse-3.3-src/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 2007-07-16 16:08:02.000000000 -0400
-@@ -119,6 +119,12 @@
+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$
@@ -55,7 +55,7 @@ diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/ec
+ 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-addfragmentsforotherplatforms.patch b/eclipse-addfragmentsforotherplatforms.patch
index 022baf7..57a6856 100644
--- a/eclipse-addfragmentsforotherplatforms.patch
+++ b/eclipse-addfragmentsforotherplatforms.patch
@@ -1,26 +1,23 @@
---- assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-04-03 11:20:05.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-04-03 11:24:25.000000000 -0400
-@@ -299,6 +299,12 @@
-
-
-
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -812,6 +818,10 @@
+diff -up ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml.fragments ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml
+--- ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml.fragments 2008-07-22 08:48:57.000000000 -0400
++++ ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-07-22 08:53:49.000000000 -0400
+@@ -94,6 +94,8 @@
+
+
+
++
++
+
+
+
+@@ -790,6 +792,10 @@
-+
++
+
+
+
-
+
diff --git a/eclipse-ia64-packaging.patch b/eclipse-ia64-packaging.patch
index baf038e..4c86f3a 100644
--- a/eclipse-ia64-packaging.patch
+++ b/eclipse-ia64-packaging.patch
@@ -1,6 +1,6 @@
-diff -up eclipse-3.3.1.1/plugins/org.eclipse.pde.build/templates/packager/packaging.properties.broken eclipse-3.3.1.1/plugins/org.eclipse.pde.build/templates/packager/packaging.properties
---- eclipse-3.3.1.1/plugins/org.eclipse.pde.build/templates/packager/packaging.properties.broken 2008-01-24 20:47:39.000000000 -0500
-+++ eclipse-3.3.1.1/plugins/org.eclipse.pde.build/templates/packager/packaging.properties 2008-01-24 20:48:07.000000000 -0500
+diff -up ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties.ia64 ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties
+--- ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties.ia64 2008-07-22 08:55:34.000000000 -0400
++++ ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties 2008-07-22 08:56:01.000000000 -0400
@@ -20,6 +20,7 @@ root.win32.win32.x86=eclipse.exe, eclips
root.linux.motif.x86=eclipse,libcairo-swt.so,libXm.so.2,about_files/,about.html,icon.xpm
root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
diff --git a/eclipse.spec b/eclipse.spec
index 933e89c..3e5b00b 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,14 +1,10 @@
# TODO:
# - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4
# - look at startup script and launcher patches
-# - update stuff for building on secondary arches
# - get Ganymede update site pre-configured
# - investigate bi-arch requirements
Epoch: 1
-# Prevent brp-java-repack-jars from being run.
-%define __jar_repack 0
-
%define eclipse_major 3
%define eclipse_minor 4
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
@@ -25,7 +21,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 5%{?dist}
+Release: 6%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -93,9 +89,9 @@ Patch4: %{name}-swttools.patch
# see this thread for details:
# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
Patch15: %{name}-pde.build-add-package-build.patch
-#Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch
-#Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch
-#Patch30: %{name}-addfragmentsforotherplatforms.patch
+Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch
+Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch
+Patch30: %{name}-addfragmentsforotherplatforms.patch
#FIXME: file a bug upstream
Patch26: %{name}-launcher-fix-java-home.patch
# Default max heap size too low for lots of people. Bump to 512 MB.
@@ -106,7 +102,7 @@ Patch26: %{name}-launcher-fix-java-home.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
Patch29: %{name}-memorypermsizeandjvmcrash.patch
-#Patch31: %{name}-ia64-packaging.patch
+Patch31: %{name}-ia64-packaging.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908
# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593
@@ -174,10 +170,9 @@ BuildRequires: sat4j
BuildRequires: objectweb-asm
%description
-The Eclipse Platform is designed for building integrated development
-environments (IDEs) that can be used to create applications as diverse
-as web sites, embedded Java(tm) programs, C++ programs, and Enterprise
-JavaBeans(tm).
+The Eclipse platform is designed for building integrated development
+environments (IDEs), server-side applications, desktop applications, and
+everything in between.
%package ecj
Summary: Eclipse Compiler for Java
@@ -396,70 +391,66 @@ find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm
# FIXME
#
-## the swt version is set to HEAD on ia64 but shouldn't be
-## get swt version
-#SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
-#SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
-#SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
-#swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
-#swt_frag_ver_ia64=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
-#sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml \
-# assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
-# features/org.eclipse.rcp/build.xml
-#
-## Nasty hack to get suppport for ppc64, sparc{,64} and alpha
-#%patch24 -p1
-#%patch28
-#%patch30
-#%patch31 -p1
-#
-## there is only partial support for ppc64 so we have to remove this
-## partial support to get the replacement hack to work
-#find -name \*ppc64\* | xargs rm -r
-## remove ppc64 support from features/org.eclipse.platform.source/feature.xml
-## replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
-#find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \;
-## remove org.eclipse.platform.source.linux.gtk.ppc64
-#sed -i "50,54d" 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 and files to ppc64 or sparc{,64} or alpha dirs and replace
-## the ia64 strings with ppc64 etc.
-#%ifarch ppc64 sparc sparcv9 sparc64 alpha
-# for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do
-# tofile=$(echo $f | sed "s/ia64/%{_arch}/")
-# mv $f $tofile
-## sed --in-place "s/ia64/%{_arch}/g" $tofile
-# done
-# OLDIFS=$IFS
-#IFS='
-#'
-# for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \
-# -a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \
-# \*.exe -a ! -name \*.pm -a ! -name \*.jpg); do
-# sed -i -e "s/ia64_32/@eye-eh-64_32@/g" -e "s/ia64/%{_arch}/g" -e "s/@eye-eh-64_32@/ia64_32/g" $f
-# done
-# IFS=$OLDIFS
-#%endif
-#
-#%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
-#IFS='
-#'
-# # Copy over the fragments for these arches
-# cp -pr plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}}
-# pushd plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}
-# for f in $(find -type f); do
-# sed -i -e "s/ppc/%{_arch}/g" $f
-# done
-# popd
-# cp -pr plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}}
-# pushd plugins/org.eclipse.core.filesystem.linux.%{_arch}
-# for f in $(find -type f); do
-# sed -i -e "s/ppc/%{_arch}/g" $f
-# done
-# popd
-# IFS=$OLDIFS
-#%endif
+# the swt version is set to HEAD on ia64 but shouldn't be
+# get swt version
+SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
+swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
+swt_frag_ver_ia64=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
+sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml \
+ plugins/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF \
+ plugins/org.eclipse.swt.gtk.linux.ia64.source/META-INF/MANIFEST.MF \
+ plugins/org.eclipse.swt.gtk.linux.ia64.source/build.xml \
+ assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
+ features/org.eclipse.rcp/build.xml
+
+# Nasty hack to get suppport for ppc64, sparc{,64} and alpha
+%patch24 -p1
+%patch28
+%patch30
+%patch31 -p1
+
+# replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
+sed -i "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" \
+ features/org.eclipse.equinox.executable/target.build.xml
+# Move all of the ia64 directories and files to ppc64 or sparc{,64} or alpha dirs and replace
+# the ia64 strings with ppc64, etc.
+%ifarch ppc64 sparc sparcv9 sparc64 alpha
+ for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do
+ tofile=$(echo $f | sed "s/ia64/%{_arch}/")
+ mv $f $tofile
+# sed --in-place "s/ia64/%{_arch}/g" $tofile
+ done
+ OLDIFS=$IFS
+IFS='
+'
+ for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \
+ -a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \
+ \*.exe -a ! -name \*.pm -a ! -name \*.jpg); do
+ sed -i -e "s/ia64_32/@eye-eh-64_32@/g" -e "s/ia64/%{_arch}/g" -e "s/@eye-eh-64_32@/ia64_32/g" $f
+ done
+ IFS=$OLDIFS
+%endif
+
+%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
+IFS='
+'
+ # Copy over the fragments for these arches
+ cp -pr plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}}
+ pushd plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}
+ for f in $(find -type f); do
+ sed -i -e "s/ppc/%{_arch}/g" $f
+ done
+ popd
+ cp -pr plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}}
+ pushd plugins/org.eclipse.core.filesystem.linux.%{_arch}
+ for f in $(find -type f); do
+ sed -i -e "s/ppc/%{_arch}/g" $f
+ done
+ popd
+ IFS=$OLDIFS
+%endif
# Symlinks
rm plugins/org.sat4j*
@@ -1355,6 +1346,10 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_*
%changelog
+* Mon Jul 21 2008 Andrew Overholt 3.4.0-6
+- Update description to be a bit more current
+- Attempt ppc64, etc. builds
+
* Mon Jul 21 2008 Andrew Overholt 3.4.0-5
- Add core.net fragment in %%files for x86
- I spoke with author about above and no .so is built because it is