fix pushd / popd problems

This commit is contained in:
Ben Konrath 2007-07-10 17:10:15 +00:00
parent 82b907742c
commit 2077a35a3b
1 changed files with 3 additions and 1 deletions

View File

@ -1132,10 +1132,11 @@ for zip in `find ${RPM_BUILD_ROOT}%{_datadir}/%{name} -type f -name \*.zip -o -t
done
rm -rf ${RPM_BUILD_ROOT}/tmp
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
# remove this python script so that it is not aot compiled, thus avoiding a
# multilib conflict
ANTPLUGINVERSION=$(ls plugins | grep org.apache.ant_ | sed 's/org.apache.ant_//')
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.apache.ant_$ANTPLUGINVERSION/bin/runant.py
rm plugins/org.apache.ant_$ANTPLUGINVERSION/bin/runant.py
%if %{gcj_support}
# exclude org.eclipse.ui.ide to work around
@ -1149,6 +1150,7 @@ aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEP
--exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_$OSGIPLUGINVERSION
%endif
%endif
popd
%clean
rm -rf $RPM_BUILD_ROOT