From 8e258fb0da3e6fcf869bb8cba321742bf5aa7eb7 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Sep 26 2007 19:40:49 +0000 Subject: - Add patch to generate 1.6 bytecode on a 1.7 VM (kudos to Olivier Thomann) - Resolves: rhbz#288991. --- diff --git a/eclipse.spec b/eclipse.spec index 4f21256..a1a19c2 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -23,7 +23,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 20%{?dist} +Release: 21%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -71,6 +71,9 @@ Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch Patch25: %{name}-launcher-double-free-bug.patch #FIXME: file a bug upstream Patch26: %{name}-launcher-fix-java-home.patch +# On a 1.7 VM, generate 1.6-level bytecode +# https://bugzilla.redhat.com/show_bug.cgi?id=288991 +Patch27: %{name}-17vmgenerate16bytecode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -350,6 +353,10 @@ sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library popd +pushd plugins/org.eclipse.jdt.core +%patch27 +popd + # use our system-installed javadocs sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \ plugins/org.eclipse.platform.doc.isv/platformOptions.txt @@ -1556,6 +1563,11 @@ fi %endif %changelog +* Wed Sep 26 2007 Andrew Overholt 3.3.0-21 +- Add patch to generate 1.6 bytecode on a 1.7 VM (kudos to Olivier + Thomann) +- Resolves: rhbz#288991. + * Tue Sep 18 2007 Andrew Overholt 3.3.0-20 - Move requirements on subclipse, cdt, mylyn, etc. to comps.xml.