[packages/ant] don't build javadoc with bootstrap

atler atler at pld-linux.org
Wed Feb 7 20:55:25 CET 2018


commit e4dc77ea7d545d9a68d00f3b4d981fea434fb73a
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Feb 7 20:54:39 2018 +0100

    don't build javadoc with bootstrap

 ant.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/ant.spec b/ant.spec
index 65534d6..48ca989 100644
--- a/ant.spec
+++ b/ant.spec
@@ -537,7 +537,7 @@ build-jar-repository lib/optional $required_jars
 export SHELL=/bin/sh
 
 %if %{with bootstrap}
-sh build.sh --noconfig main javadocs
+sh build.sh --noconfig main
 %else
 %ant -Dbuild.compiler=extJavac main javadocs
 %endif
@@ -655,9 +655,11 @@ echo "netrexx ant/ant-netrexx" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/netrexx
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 # javadoc
+%if %{without bootstrap}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -843,7 +845,9 @@ ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 %defattr(644,root,root,755)
 %doc manual/*
 
+%if %{without bootstrap}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ant.git/commitdiff/e4dc77ea7d545d9a68d00f3b4d981fea434fb73a



More information about the pld-cvs-commit mailing list