[javapackages-tools/f21] Add namespace support in %mvn_artifact

[Michal Srb]

commit 7804e2cd94a95b0c8b301205fc8636288c55c683
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Nov 24 11:54:52 2014 +0100

    Add namespace support in %mvn_artifact

 0006-mvn_artifact-Add-namespace-support.patch |   69 +++++++++++++++++++++++++
 javapackages-tools.spec                       |    7 ++-
 2 files changed, 75 insertions(+), 1 deletions(-)
---
diff --git a/0006-mvn_artifact-Add-namespace-support.patch b/0006-mvn_artifact-Add-namespace-support.patch
new file mode 100644
index 0000000..e50d7e4
--- /dev/null
+++ b/0006-mvn_artifact-Add-namespace-support.patch
@@ -0,0 +1,69 @@
+From 27cab940e4116b5eb90f9bf098734b7754c3daa5 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb at redhat.com>
+Date: Mon, 24 Nov 2014 10:28:42 +0100
+Subject: [PATCH] [mvn_artifact] Add namespace support
+
+---
+ java-utils/mvn_artifact.py | 11 +++++++++--
+ macros.d/macros.xmvn       |  2 +-
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
+index 9ace911..f1cdbd6 100644
+--- a/java-utils/mvn_artifact.py
++++ b/java-utils/mvn_artifact.py
+@@ -117,7 +117,7 @@ def is_it_ivy_file(fpath):
+     return doc.tag == "ivy-module"
+ 
+ 
+-def add_artifact_elements(root, art, ppath=None, jpath=None):
++def add_artifact_elements(root, art, namespace="", ppath=None, jpath=None):
+     artifacts = []
+     ext_backup = art.extension
+     for path in [ppath, jpath]:
+@@ -132,6 +132,10 @@ def add_artifact_elements(root, art, ppath=None, jpath=None):
+                 art.extension = ext_backup
+ 
+             art.path = os.path.abspath(path)
++
++            if namespace:
++                art.namespace = namespace
++
+             a = art.to_metadata()
+             artifacts.append(a)
+ 
+@@ -258,6 +262,9 @@ if __name__ == "__main__":
+                         epilog=epilog)
+     parser.add_option("--skip-dependencies", action="store_true", default=False,
+                       help="skip dependencies section in resulting metadata")
++    parser.add_option("-n", "--namespace", type="str",
++                      help="Namespace for generated artifacts", default="")
++
+     for index, arg in enumerate(sys.argv):
+         sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ 
+@@ -321,7 +328,7 @@ if __name__ == "__main__":
+     else:
+         art.properties['xmvn.resolver.disableEffectivePom'] = 'true'
+ 
+-    add_artifact_elements(metadata, art, pom_path, jar_path)
++    add_artifact_elements(metadata, art, options.namespace, pom_path, jar_path)
+ 
+     with open(config, 'w') as f:
+         dom = metadata.toDOM(None)
+diff --git a/macros.d/macros.xmvn b/macros.d/macros.xmvn
+index 80158fe..a06d236 100644
+--- a/macros.d/macros.xmvn
++++ b/macros.d/macros.xmvn
+@@ -118,7 +118,7 @@
+ #
+ # Usage: %mvn_artifact <pom> [<artifact-file>]
+ #
+-%mvn_artifact python %{javadir}-utils/mvn_artifact.py
++%mvn_artifact python %{javadir}-utils/mvn_artifact.py -n "%{?scl}"
+ 
+ 
+ # %mvn_build - build Maven project
+-- 
+1.9.3
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index a9699f2..26ac666 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
 Name:           javapackages-tools
 Version:        4.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -13,6 +13,7 @@ Patch1:         0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch
 Patch2:         0003-Use-architecture-independent-location-of-abrt-java-c.patch
 Patch3:         0004-Make-sure-_libdir-is-not-use.patch
 Patch4:         0005-Improve-patterns-for-matching-OSGi-manifests.patch
+Patch5:         0006-mvn_artifact-Add-namespace-support.patch
 
 BuildArch:      noarch
 
@@ -142,6 +143,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %configure
@@ -182,6 +184,9 @@ popd
 %doc LICENSE
 
 %changelog
+* Mon Nov 24 2014 Michal Srb <msrb at redhat.com> - 4.1.0-5
+- Add namespace support in %%mvn_artifact
+
 * Fri Nov 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 4.1.0-4
 - Fix OSGi provides/requires generation in Java libdir
 - Resolves: rhbz#1166156