diff --git a/eclipse.spec b/eclipse.spec
index 8d2e35d..b5cad97 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:        28%{?dist} 
+Release:        29%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1170,20 +1170,20 @@ pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
 # multilib conflict
 ANTPLUGINVERSION=$(ls plugins | grep org.apache.ant_ | sed 's/org.apache.ant_//')
 rm plugins/org.apache.ant_$ANTPLUGINVERSION/bin/runant.py
+UIIDEPLUGINVERSION=$(ls plugins | grep ui.ide_ | sed 's/org.eclipse.ui.ide_//')
+OSGIPLUGINVERSION=$(ls plugins | grep osgi_ | sed 's/org.eclipse.osgi_//')
+popd
 
 %if %{gcj_support}
+%ifnarch ia64
 # exclude org.eclipse.ui.ide to work around
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175547
-UIIDEPLUGINVERSION=$(ls plugins | grep ui.ide_ | sed 's/org.eclipse.ui.ide_//')
-%ifnarch ia64
 aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION
 %else
-OSGIPLUGINVERSION=$(ls plugins | grep osgi_ | sed 's/org.eclipse.osgi_//')
 aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \
                 --exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_$OSGIPLUGINVERSION
 %endif
 %endif
-popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1580,6 +1580,10 @@ fi
 %endif
 
 %changelog
+* Tue Oct 30 2007 Andrew Overholt <overholt@redhat.com> 3.3.0-29
+- Move popd at end of %%install to allow aot-compile-rpm to allow it to
+  use the current directory for its temp directory.
+
 * Mon Oct 29 2007 Andrew Overholt <overholt@redhat.com> 3.3.0-28
 - Add patch for memory issues with IcedTea.