From da0b3c505e8fc1944489edf1b9639202837f600caaa6380aa5a03627e841eb08 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 1 Apr 2019 08:59:57 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=62 --- javapackages-tools.changes | 6 ++++++ javapackages-tools.spec | 25 ++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) 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 From b655b0f4b6109c764b88288b560ca8d90ea0e355b0a483d7c9868d04c2e0af0d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 1 Apr 2019 09:04:35 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=63 --- javapackages-tools.changes | 6 ------ 1 file changed, 6 deletions(-) diff --git a/javapackages-tools.changes b/javapackages-tools.changes index b244ceb..25594b3 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -34,12 +34,6 @@ 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 From df8742128676c89bed667c27b83dd4230b47597f85863f776cdc83c4fa22a979 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 Apr 2019 09:43:41 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=64 --- javapackages-tools.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 25594b3..da2915f 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 3 09:42:32 UTC 2019 - Fridrich Strba + +- Make the ivy-local and maven-local sub-packages depend on the + right stuff, so that they actually can be used for building + ------------------------------------------------------------------- Mon Mar 4 17:34:49 UTC 2019 - Fridrich Strba From 56f24ac370adfe5a2590ca91b2322b9c1a746afb6a4fdd38fc2b7a508c30c79b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 4 Apr 2019 08:03:52 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=65 --- javapackages-tools.changes | 6 ++++++ javapackages-tools.spec | 31 ------------------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/javapackages-tools.changes b/javapackages-tools.changes index da2915f..2c71861 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 4 08:01:41 UTC 2019 - Fridrich Strba + +- Split maven-local meta-package out of javapackages-tools spec + file + ------------------------------------------------------------------- Wed Apr 3 09:42:32 UTC 2019 - Fridrich Strba diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 793224b..576e85b 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -75,35 +75,6 @@ This package provides some basic directories into which Java packages install their content. %if %{with python} -%package -n maven-local -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. - %package -n gradle-local Summary: Local mode for Gradle Group: Development/Languages/Java @@ -231,8 +202,6 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/ %files -n javapackages-local -f files-local %dir %{_datadir}/java-utils -%files -n maven-local -f files-maven - %files -n gradle-local -f files-gradle %dir %{_datadir}/gradle-local