diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 25594b3..b244ceb 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -34,6 +34,12 @@ Wed Oct 24 08:19:24 UTC 2018 - Fridrich Strba + rediff to changed code - Build the :extras flavour as noarch +------------------------------------------------------------------- +Wed Oct 24 08:11:59 UTC 2018 - Fridrich Strba + +- Add to the spec-file the xmvn dependencies for different + subpackages currently resolved + ------------------------------------------------------------------- Wed Oct 24 07:53:45 UTC 2018 - Fridrich Strba diff --git a/javapackages-tools.spec b/javapackages-tools.spec index e7528cd..793224b 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -80,6 +80,26 @@ Summary: Macros and scripts for Maven packaging support Group: Development/Languages/Java Requires: javapackages-local = %{version} Requires: javapackages-tools = %{version} +Requires: xmvn-connector-aether +Requires: xmvn-install +Requires: xmvn-minimal +Requires: xmvn-mojo +Requires: xmvn-resolve +# Common Maven plugins required by almost every build. It wouldn't make +# 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. +# Include JUnit and JUnit provider for Surefire just for convenience. +Requires: mvn(junit:junit) +Requires: mvn(org.apache.maven.surefire:surefire-junit4) +# testng is quite common as well +Requires: mvn(org.apache.maven.surefire:surefire-testng) %description -n maven-local This package provides macros and scripts to support packaging Maven artifacts. @@ -98,8 +118,10 @@ resolution using XMvn resolver. Summary: Local mode for Apache Ivy Group: Development/Languages/Java Requires: ant +Requires: apache-ivy >= 2.3.0 Requires: javapackages-local = %{version} Requires: javapackages-tools = %{version} +Requires: xmvn-connector-ivy %description -n ivy-local This package implements local mode fow Apache Ivy, which allows @@ -110,7 +132,8 @@ Summary: Module for handling various files for Java packaging Group: Development/Languages/Java Requires: python3-lxml Requires: python3-six -Obsoletes: python-javapackages +Obsoletes: python-javapackages < %{version}-%{release} +Provides: python-javapackages = %{version}-%{release} %description -n python3-javapackages Module for handling, querying and manipulating of various files for Java