From 262784e33c64dbb2306c50f02e5c228f87d4e213 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Dec 19 2008 17:44:14 +0000
Subject: - Fixed GCJ AOT compilation (Gary Benson).


---

diff --git a/eclipse.spec b/eclipse.spec
index 8af4b5c..457122d 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1280,9 +1280,11 @@ ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar \
 
 popd
 
-unset RPM_PACKAGE_NAME
-aot-compile -c "$RPM_OPT_FLAGS" $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins \
-  $RPM_BUILD_ROOT%{_libdir}/gcj/eclipse-ecj
+tmpdir=$PWD/aot-compile-ecj # must not be within $RPM_BUILD_ROOT
+mkdir -p $tmpdir
+cp -p $sdkDir/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar $tmpdir
+RPM_PACKAGE_NAME=eclipse-ecj RPM_BUILD_ROOT=$tmpdir aot-compile-rpm
+cp -rp $tmpdir%{_libdir}/gcj $RPM_BUILD_ROOT%{_libdir}/gcj
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1565,7 +1567,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
-* Mon Dec 15 2008 Andrew Overholt <overholt@redhat.com> 1:3.4.1-12
+* Fri Dec 19 2008 Andrew Overholt <overholt@redhat.com> 1:3.4.1-12
+- Fixed GCJ AOT compilation (Gary Benson).
+
+* Mon Dec 15 2008 Andrew Overholt <overholt@redhat.com> 1:3.4.1-11
 - Update pdebuild and package-build patch to include -z option.
 - Make ecj default to 1.5 (rh#354721).
 - Add GCJ AOT bits for ecj (rh#473674).