Fix bootstrap build
This commit is contained in:
parent
50e1f9ed5e
commit
397502e00d
8
ant.spec
8
ant.spec
@ -29,11 +29,12 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
%bcond_without tests
|
|
||||||
|
|
||||||
%if %with bootstrap
|
%if %with bootstrap
|
||||||
|
%bcond_with tests
|
||||||
%bcond_with javadoc
|
%bcond_with javadoc
|
||||||
%else
|
%else
|
||||||
|
%bcond_without tests
|
||||||
%bcond_without javadoc
|
%bcond_without javadoc
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -416,11 +417,6 @@ do
|
|||||||
jarname=$(basename $jar .jar)
|
jarname=$(basename $jar .jar)
|
||||||
pomname="JPP.%{name}-${jarname}.pom"
|
pomname="JPP.%{name}-${jarname}.pom"
|
||||||
|
|
||||||
%if %with bootstrap
|
|
||||||
#Bootstracp builds an incomplete ant-junit, don't ship it
|
|
||||||
[ $jarname == ant-bootstrap ] && continue
|
|
||||||
%endif
|
|
||||||
|
|
||||||
#instal jar
|
#instal jar
|
||||||
install -m 644 ${jar} $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar
|
install -m 644 ${jar} $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar
|
||||||
# jar aliases
|
# jar aliases
|
||||||
|
Loading…
Reference in New Issue
Block a user