[fedora-java] aot-compile-rpm

[Gary Benson]

Gary Benson wrote:
> Andrew Overholt wrote:
> > Cool.  I went through and added aot-compile-rpm to the end of
> > %install but it fails with:
> > 
> > + aot-compile-rpm
> > Traceback (most recent call last):
> >  [snip]
> > AssertionError
> > error: Bad exit status from /var/tmp/rpm-tmp.84677 (%install)
> > 
> > Any ideas?  My python-fu is _very_ weak (and by that I mean it's
> > non-existent).
> 
> I committed some improvements to this bit yesterday; the very latest
> aot-compile-rpm (from java-1.4.2-gcj-compat-devel-1.4.2.0-40jpp_37rh)
> might cope, and even if it doesn't it'll give you a more meaningful
> error message.

I guess it coped then ;)

Can I suggest this patch to eclipse.spec?

Cheers,
Gary
-------------- next part --------------
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.171
diff -u -r1.171 eclipse.spec
--- eclipse.spec	14 Jul 2005 21:29:47 -0000	1.171
+++ eclipse.spec	15 Jul 2005 09:06:21 -0000
@@ -821,20 +821,16 @@
   $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
 
 %if %{gcj_support}
-aot-compile-rpm --exclude /usr/share/eclipse/plugins/org.eclipse.osgi_3.1.0.jar
-
 # FIXME:  temporarily disable org.eclipse.ui.forms_3.1.0.jar.so 
 # see:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146463
-rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.db
-rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.so
 # FIXME:  temporarily disable org.eclipse.ui.workbench_3.1.0.jar.so
 # see:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
-rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.0.jar.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.0.jar.db
 # FIXME:  temporarily disable org.eclipse.osgi_3.1.0.jar.so
 # see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158137
-rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.0.jar.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.0.jar.db
+aot-compile-rpm \
+    --exclude /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar \
+    --exclude /usr/share/eclipse/plugins/org.eclipse.ui.workbench_3.1.0.jar \
+    --exclude /usr/share/eclipse/plugins/org.eclipse.osgi_3.1.0.jar
 
 # Build and install ecj binary
 pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}