rpms/eclipse/devel eclipse.spec,1.614,1.615

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6227/devel

Modified Files:
	eclipse.spec 
Log Message:
* Fri Dec 19 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-12
- Fixed GCJ AOT compilation (Gary Benson).


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -r1.614 -r1.615
--- eclipse.spec	16 Dec 2008 17:17:18 -0000	1.614
+++ eclipse.spec	19 Dec 2008 17:44:14 -0000	1.615
@@ -30,7 +30,7 @@
 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 @@
 
 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 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
-* Mon Dec 15 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-12
+* Fri Dec 19 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-12
+- Fixed GCJ AOT compilation (Gary Benson).
+
+* Mon Dec 15 2008 Andrew Overholt <overholt at 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).