fix pushd / popd problems
This commit is contained in:
parent
82b907742c
commit
2077a35a3b
|
@ -1132,10 +1132,11 @@ for zip in `find ${RPM_BUILD_ROOT}%{_datadir}/%{name} -type f -name \*.zip -o -t
|
||||||
done
|
done
|
||||||
rm -rf ${RPM_BUILD_ROOT}/tmp
|
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
|
# remove this python script so that it is not aot compiled, thus avoiding a
|
||||||
# multilib conflict
|
# multilib conflict
|
||||||
ANTPLUGINVERSION=$(ls plugins | grep org.apache.ant_ | sed 's/org.apache.ant_//')
|
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}
|
%if %{gcj_support}
|
||||||
# exclude org.eclipse.ui.ide to work around
|
# 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
|
--exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_$OSGIPLUGINVERSION
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
popd
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
Loading…
Reference in New Issue