From 290d1ff88018f72559e65e8fdb063bcb5af16da6 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Fri, 8 Feb 2008 16:00:41 +0000 Subject: [PATCH] - Add ia64 patches from Doug Chapman. - rhbz#431963. --- eclipse-ia64-packaging.patch | 11 +++++++++++ eclipse.spec | 18 ++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 eclipse-ia64-packaging.patch diff --git a/eclipse-ia64-packaging.patch b/eclipse-ia64-packaging.patch new file mode 100644 index 0000000..baf038e --- /dev/null +++ b/eclipse-ia64-packaging.patch @@ -0,0 +1,11 @@ +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 +@@ -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 + root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm ++root.linux.gtk.ia64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm + root.linux.gtk.ppc=eclipse + root.macosx.carbon.ppc=eclipse,Eclipse.app/ + root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS diff --git a/eclipse.spec b/eclipse.spec index b5d16be..7a6b955 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -19,7 +19,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 14%{?dist} +Release: 15%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -86,6 +86,8 @@ Patch27: %{name}-17vmgenerate16bytecode.patch # https://bugzilla.redhat.com/show_bug.cgi?id=352361 Patch29: %{name}-maxpermsize.patch +Patch31: %{name}-ia64-packaging.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant BuildRequires: jpackage-utils >= 0:1.5, make, gcc @@ -537,6 +539,8 @@ sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gt %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 @@ -563,6 +567,12 @@ IFS=' \*.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 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} @@ -771,7 +781,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java # Explode the resulting SDK tarball tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz cp eclipse/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse -%ifarch ppc64 sparc sparc64 alpha +%ifarch ppc64 sparc sparc64 alpha ia64 cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_libdir}/eclipse %else mv $RPM_BUILD_ROOT%{_datadir}/eclipse/eclipse.ini \ @@ -1612,6 +1622,10 @@ fi %endif %changelog +* Fri Feb 08 2008 Andrew Overholt 3.3.1.1-15 +- Add ia64 patches from Doug Chapman. +- rhbz#431963. + * Wed Dec 05 2007 Martin Stransky 3.3.1.1-14 - rebuilt against XUL Runner (gecko-libs 1.9) - removed .png extension from the desktop file