Move mvn_build and builddep to javapackages-local

- Resolves: rhbz#1290399

0001-Initial-gradle_build-implementation.patch

@@ -1,7 +1,7 @@
 From 2e56f8b1adb6b53e9541658c24fa1dbf46c91482 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Tue, 27 Oct 2015 16:20:35 +0100
-Subject: [PATCH] Initial %gradle_build implementation
+Subject: [PATCH 1/2] Initial %gradle_build implementation
 
 ---
  gradle/init.gradle            | 16 +++++++---------
@@ -148,5 +148,5 @@ index 170e108..3b0f6d4 100644
 ---batch-mode --offline -X -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
 +--batch-mode --offline --debug -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
 -- 
-2.4.3
+2.5.0
 

0002-install-Move-mvn_build-and-builddep-from-maven-local.patch

@@ -0,0 +1,48 @@
+From 3b075d731be2348dd62e70835ae01a0cc760cdda Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb@redhat.com>
+Date: Tue, 8 Dec 2015 10:48:52 +0100
+Subject: [PATCH 2/2] [install] Move mvn_build and builddep from maven-local to
+ javapackages-local
+
+---
+ install | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/install b/install
+index 3a3bcf4..ade6b97 100755
+--- a/install
++++ b/install
+@@ -171,8 +171,10 @@ link "${m2home}/configuration.xml" "${m2home}/configuration-21.xml"
+ inst_config etc/javapackages-config.json "${javaconfdir}"
+ 
+ exec >files-local
++inst_data java-utils/builddep.py "${javadir}-utils"
+ inst_data java-utils/mvn_alias.py "${javadir}-utils"
+ inst_data java-utils/mvn_artifact.py "${javadir}-utils"
++inst_data java-utils/mvn_build.py "${javadir}-utils"
+ inst_data java-utils/mvn_compat_version.py "${javadir}-utils"
+ inst_data java-utils/mvn_config.py "${javadir}-utils"
+ inst_data java-utils/mvn_file.py "${javadir}-utils"
+@@ -180,6 +182,7 @@ inst_data java-utils/mvn_package.py "${javadir}-utils"
+ 
+ inst_data target/mvn_alias.7 "${mandir}/man7"
+ inst_data target/mvn_artifact.7 "${mandir}/man7"
++inst_data target/mvn_build.7 "${mandir}/man7"
+ inst_data target/mvn_compat_version.7 "${mandir}/man7"
+ inst_data target/mvn_config.7 "${mandir}/man7"
+ inst_data target/mvn_file.7 "${mandir}/man7"
+@@ -193,11 +196,6 @@ dir "${m2home}"
+ inst_data metadata/metadata-org-apache-maven-plugins.xml "${sysconfdir}/maven"
+ inst_data metadata/metadata-org-codehaus-mojo.xml "${sysconfdir}/maven"
+ 
+-inst_data java-utils/builddep.py "${javadir}-utils"
+-inst_data java-utils/mvn_build.py "${javadir}-utils"
+-
+-inst_data target/mvn_build.7 "${mandir}/man7"
+-
+ 
+ exec >files-ivy
+ 
+-- 
+2.5.0
+

javapackages-tools.spec

@@ -9,14 +9,16 @@
 
 Name:           javapackages-tools
 Version:        4.6.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
 License:        BSD
 URL:            https://git.fedorahosted.org/git/javapackages.git
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
+
 Patch0:         0001-Initial-gradle_build-implementation.patch
+Patch1:         0002-install-Move-mvn_build-and-builddep-from-maven-local.patch
 
 BuildArch:      noarch
 
@@ -139,6 +141,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %prep
 %setup -q -n javapackages-%{version}
 %patch0 -p1
+%patch1 -p1
 
 sed -i '/fedora-review/d' install
 
@@ -177,6 +180,10 @@ popd
 %license LICENSE
 
 %changelog
+* Mon Jan  4 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.6.0-12
+- Move mvn_build and builddep to javapackages-local
+- Resolves: rhbz#1290399
+
 * Wed Nov 11 2015 Kalev Lember <klember@redhat.com> - 4.6.0-11
 - Disable bootstrap