[ant] Convert %global build_javadoc to conditional
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Jul 2 08:30:44 UTC 2013
commit 50e1f9ed5ebdbf6a77c03017a10eece2ef349db8
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Jul 2 07:48:53 2013 +0200
Convert %global build_javadoc to conditional
ant.spec | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index b12d8d0..b060aa7 100644
--- a/ant.spec
+++ b/ant.spec
@@ -32,9 +32,9 @@
%bcond_without tests
%if %with bootstrap
-%global build_javadoc 0
+%bcond_with javadoc
%else
-%global build_javadoc 1
+%bcond_without javadoc
%endif
%global with_manifest_only 0
@@ -389,7 +389,7 @@ mv LICENSE.utf8 LICENSE
%build
%if %without bootstrap
%{ant} jars test-jar
-%if %{build_javadoc}
+%if %with javadoc
export CLASSPATH=$(build-classpath antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
%{ant} javadocs
%endif
@@ -489,7 +489,7 @@ echo "junit ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
%endif
-%if %{build_javadoc}
+%if %with javadoc
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -671,7 +671,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
%doc LICENSE NOTICE
%doc manual/*
-%if %{build_javadoc}
+%if %with javadoc
%files javadoc
%doc LICENSE NOTICE
%{_javadocdir}/%{name}
@@ -688,6 +688,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
- Update to current packaging guidelines
- Run tests in %%check instead of %%build
- Remove dependencies on xerces-j2 and xml-commons-apis
+- Convert %%global build_javadoc to conditional
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.9.1-2
- Enable unit tests
More information about the scm-commits
mailing list