diff --git a/javapackages-tools.spec b/javapackages-tools.spec index cf3d90e..fb75fd6 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -4,6 +4,7 @@ %bcond_without gradle %bcond_without tests +%bcond_with xmvn_javadoc %if 0%{?fedora} %global python_prefix python3 @@ -19,7 +20,7 @@ Name: javapackages-tools Version: 5.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Macros and scripts for Java packaging support @@ -68,7 +69,9 @@ Requires: xmvn-connector-aether # sense to explicitly require them in every package built with Maven. Requires: mvn(org.apache.maven.plugins:maven-compiler-plugin) Requires: mvn(org.apache.maven.plugins:maven-jar-plugin) +%if %{without xmvn_javadoc} Requires: mvn(org.apache.maven.plugins:maven-javadoc-plugin) +%endif Requires: mvn(org.apache.maven.plugins:maven-resources-plugin) Requires: mvn(org.apache.maven.plugins:maven-surefire-plugin) # Tests based on JUnit are very common and JUnit itself is small. @@ -141,6 +144,9 @@ This package provides non-essential macros and scripts to support Java packaging %install ./install +%if %{with xmvn_javadoc} +sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fjava') +%endif sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* %if %{without gradle} @@ -170,6 +176,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %license LICENSE %changelog +* Mon Jul 10 2017 Mikolaj Izdebski - 5.0.0-5 +- Conditionalize use of XMvn Javadoc MOJO + * Mon Jul 03 2017 Michael Simacek - 5.0.0-4 - Fix default JRE path