OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=15

xmvn-connector-ivy.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package xmvn
+# spec file for package xmvn-connector-ivy
 #
 # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -25,7 +25,6 @@ Release:        0
 Summary:        XMvn Connector for Apache Ivy
 License:        Apache-2.0
 Group:          Development/Tools/Building
-BuildArch:      noarch
 URL:            https://fedora-java.github.io/xmvn/
 Source0:        https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
 Source1:        %{parent}-build.tar.xz
@@ -39,12 +38,14 @@ Patch6:         0001-Use-apache-commons-compress-for-manifest-injection-a.patch
 Patch7:         0001-port-to-gradle-4.4.1.patch
 Patch8:         0001-Replace-JAXB-parser.patch
 BuildRequires:  %{parent}-api = %{version}
-BuildRequires:  ant fdupes
+BuildRequires:  ant
 BuildRequires:  apache-ivy
+BuildRequires:  fdupes
 BuildRequires:  javapackages-local
 BuildRequires:  slf4j
 BuildRequires:  xmvn-install
 BuildRequires:  xmvn-resolve
+BuildArch:      noarch
 
 %description
 This package provides XMvn MOJO, which is a Maven plugin that consists
@@ -106,13 +107,13 @@ mkdir -p lib
 build-jar-repository -s lib \
 	ivy slf4j/api %{parent}/%{parent}-api
 pushd %{name}
-  %ant \
+  %{ant} \
 %if %{without tests}
   -Dtest.skip=true \
 %endif
   package javadoc
 
-%mvn_artifact pom.xml target/%{name}-%{version}.jar
+%{mvn_artifact} pom.xml target/%{name}-%{version}.jar
 
 popd
 

xmvn-mojo.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package xmvn
+# spec file for package xmvn-mojo
 #
 # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -39,9 +39,6 @@ BuildRequires:  %{parent}-api = %{version}
 BuildRequires:  %{parent}-core = %{version}
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local
-BuildRequires:  xmvn
-BuildRequires:  xmvn-install
-BuildRequires:  xmvn-resolve
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-compiler-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-jar-plugin)
@@ -55,6 +52,9 @@ BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  xmvn
+BuildRequires:  xmvn-install
+BuildRequires:  xmvn-resolve
 BuildArch:      noarch
 
 %description

xmvn-tools.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package xmvn
+# spec file for package xmvn-tools
 #
 # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -205,7 +205,7 @@ build-jar-repository -s lib \
 	beust-jcommander commons-compress maven-invoker/maven-invoker \
 	objectweb-asm/asm plexus-containers/plexus-component-annotations \
 	plexus-containers/plexus-container-default plexus/utils slf4j/api
-%ant -Dtest.skip=true package javadoc
+%{ant} -Dtest.skip=true package javadoc
 
 %install
 # jars

xmvn.spec

@@ -23,11 +23,13 @@ Summary:        Local Extensions for Apache Maven
 License:        Apache-2.0
 Group:          Development/Tools/Building
 URL:            https://fedora-java.github.io/xmvn/
-BuildRequires:  maven maven-lib
 BuildRequires:  %{name}-api = %{version}
 BuildRequires:  %{name}-connector-aether = %{version}
 BuildRequires:  %{name}-core = %{version}
-BuildRequires:  javapackages-tools %{name}-subst
+BuildRequires:  %{name}-subst
+BuildRequires:  javapackages-tools
+BuildRequires:  maven
+BuildRequires:  maven-lib
 Requires:       %{name}-minimal = %{version}-%{release}
 
 %description