rpms/ant
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Convert %global build_javadoc to conditional

Browse Source
This commit is contained in:
Mikolaj Izdebski 2013-07-02 07:48:53 +02:00
parent c7830d9ec1
commit 50e1f9ed5e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ant.spec
View File

@ -32,9 +32,9 @@
%bcond_without tests %bcond_without tests
%if %with bootstrap %if %with bootstrap
%global build_javadoc 0 %bcond_with javadoc
%else %else
%global build_javadoc 1 %bcond_without javadoc
%endif %endif
%global with_manifest_only 0 %global with_manifest_only 0
@ -389,7 +389,7 @@ mv LICENSE.utf8 LICENSE
%build %build
%if %without bootstrap %if %without bootstrap
%{ant} jars test-jar %{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) 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 %{ant} javadocs
%endif %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 echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
%endif %endif
%if %{build_javadoc} %if %with javadoc
# javadoc # javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/javadocs/* $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 LICENSE NOTICE
%doc manual/* %doc manual/*
%if %{build_javadoc} %if %with javadoc
%files javadoc %files javadoc
%doc LICENSE NOTICE %doc LICENSE NOTICE
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
@ -688,6 +688,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
- Update to current packaging guidelines - Update to current packaging guidelines
- Run tests in %%check instead of %%build - Run tests in %%check instead of %%build
- Remove dependencies on xerces-j2 and xml-commons-apis - Remove dependencies on xerces-j2 and xml-commons-apis
- Convert %%global build_javadoc to conditional
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.9.1-2 * Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.9.1-2
- Enable unit tests - Enable unit tests