diff --git a/eclipse.spec b/eclipse.spec index 4c2efb9..cf4d707 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -26,7 +26,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 18%{?dist} +Release: 19%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -112,6 +112,11 @@ Patch57: %{name}-ecj-gcj.patch Patch59: %{name}-swt-firefox.patch Patch60: %{name}-swt-firefox.2.patch Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch +# Look at gre64.conf *after* gre.conf on x86_64. Add ppc64 to the list of +# arches on which to do this. +# part of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=207016 +# FIXME: file the ordering issue upstream +Patch101: %{name}-lookatgre64aftergre.patch %if %{gcj_support} @@ -422,6 +427,7 @@ mkdir launchertmp unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip pushd launchertmp %patch47 -p0 +%patch101 -p0 # put the configuration directory in an arch specific location sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c # make the eclipse install relocatable @@ -432,6 +438,7 @@ mv launchersrc.zip plugins/org.eclipse.platform rm -rf launchertmp pushd features/org.eclipse.platform.launchers %patch47 -p0 +%patch101 -p0 # put the configuration directory in an arch specific location sed --in-place "s:/usr/lib/eclipse:%{_libdir}/%{name}:" library/eclipse.c # make the eclipse install relocatable @@ -1730,6 +1737,9 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml* %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Thu Nov 16 2006 Andrew Overholt 3.2.1-19 +- Add patch to look at gre64.conf on ppc64. + * Fri Nov 10 2006 Ben Konrath 3.2.1-18 - Remove SWT ON_TOP patch as it is fixed in 3.2.1.