diff --git a/0006-mvn_artifact-Add-namespace-support.patch b/0006-mvn_artifact-Add-namespace-support.patch new file mode 100644 index 0000000..d03f899 --- /dev/null +++ b/0006-mvn_artifact-Add-namespace-support.patch @@ -0,0 +1,68 @@ +From 3f1b4b9e3427c0c633039c346475b9f47aa0f35e Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Mon, 24 Nov 2014 10:28:42 +0100 +Subject: [PATCH] [mvn_artifact] Add namespace support + +--- + java-utils/mvn_artifact.py | 10 ++++++++-- + macros.d/macros.xmvn | 2 +- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py +index 78074f0..185eb9d 100644 +--- a/java-utils/mvn_artifact.py ++++ b/java-utils/mvn_artifact.py +@@ -118,7 +118,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]: +@@ -133,6 +133,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) + +@@ -246,6 +250,8 @@ if __name__ == "__main__": + help="skip dependencies section in resulting metadata") + parser.add_option("-D", action="append", type="str", + help="add artifact property", metavar="property=value") ++ parser.add_option("-n", "--namespace", type="str", ++ help="Namespace for generated artifacts", default="") + + sys.argv = args_to_unicode(sys.argv) + +@@ -311,7 +317,7 @@ if __name__ == "__main__": + key, value = d_opt.split('=') + art.properties[key] = value + +- 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 e7a6dda..fc2e724 100644 +--- a/macros.d/macros.xmvn ++++ b/macros.d/macros.xmvn +@@ -118,7 +118,7 @@ + # + # Usage: %mvn_artifact [] + # +-%mvn_artifact %{pyinterpreter} %{javadir}-utils/mvn_artifact.py ++%mvn_artifact %{pyinterpreter} %{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 806f260..37b677f 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -7,7 +7,7 @@ Name: javapackages-tools Version: 4.2.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Macros and scripts for Java packaging support @@ -22,6 +22,7 @@ Patch4: 0003-Use-architecture-independent-location-of-abrt-java-c.patch Patch5: 0001-fix-rhbz#1155185.patch Patch6: 0004-Make-sure-_libdir-is-not-use.patch Patch7: 0005-Improve-patterns-for-matching-OSGi-manifests.patch +Patch8: 0006-mvn_artifact-Add-namespace-support.patch BuildArch: noarch @@ -181,6 +182,7 @@ This package provides non-essential macros and scripts to support Java packaging %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %if 0%{?with_python3} find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|' @@ -246,6 +248,9 @@ popd %doc LICENSE %changelog +* Mon Nov 24 2014 Michal Srb - 4.2.0-8 +- Add namespace support in %%mvn_artifact + * Fri Nov 21 2014 Mikolaj Izdebski - 4.2.0-7 - Fix OSGi provides/requires generation in Java libdir - Resolves: rhbz#1166156