From f94bdba80c2938ee66bcebea71f3e9e2e2fbdf65 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Tue, 10 Jun 2014 16:36:57 +0200
Subject: [PATCH] Backport fix for maven.prov

---
 ...e-provides-for-compat-artifacts-with.patch | 43 +++++++++++++++++++
 javapackages-tools.spec                       |  7 ++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 0001-artifact-Generate-provides-for-compat-artifacts-with.patch

diff --git a/0001-artifact-Generate-provides-for-compat-artifacts-with.patch b/0001-artifact-Generate-provides-for-compat-artifacts-with.patch
new file mode 100644
index 0000000..122ea59
--- /dev/null
+++ b/0001-artifact-Generate-provides-for-compat-artifacts-with.patch
@@ -0,0 +1,43 @@
+From 642f1828322489c6b5b0e450994a3d8a5836d56f Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb@redhat.com>
+Date: Tue, 10 Jun 2014 16:19:18 +0200
+Subject: [PATCH] [artifact] Generate provides for compat artifacts with
+ alliases
+
+---
+ python/javapackages/artifact.py | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/python/javapackages/artifact.py b/python/javapackages/artifact.py
+index c6afc34..fc3f245 100644
+--- a/python/javapackages/artifact.py
++++ b/python/javapackages/artifact.py
+@@ -108,19 +108,21 @@ class ProvidedArtifact(object):
+         strlist = []
+         if not self.compatVersions:
+             strlist.append(self.artifact.get_rpm_str())
++            for alias in self.aliases:
++                full_alias = Artifact.merge_artifacts(alias.artifact, self.artifact)
++                strlist.append(full_alias.get_rpm_str())
+         else:
+             for ver in self.compatVersions:
+                 rpmstr = self.artifact.get_rpm_str(ver)
+                 strlist.append(rpmstr)
++                for alias in self.aliases:
++                    full_alias = Artifact.merge_artifacts(alias.artifact, self.artifact)
++                    strlist.append(full_alias.get_rpm_str(ver))
+ 
+         if not (self.version):
+             raise ArtifactFormatException(
+                 "Cannot create versioned string from artifact without version: {art}".format(art=str(self)))
+ 
+-        for alias in self.aliases:
+-            full_alias = Artifact.merge_artifacts(alias.artifact, self.artifact)
+-            strlist.append(full_alias.get_rpm_str())
+-
+         result = ""
+         for rpmstr in strlist:
+             if result:
+-- 
+1.9.3
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 0f98f32..6f10847 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
 Name:           javapackages-tools
 Version:        4.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -16,6 +16,7 @@ Patch4:         0008-Fix-javapackages-metadata.xml.patch
 Patch5:         0010-maven.req-When-generating-req-from-POM-file-do-not-b.patch
 Patch6:         add-support-for-xmvn.resolver.disableEffectivePom-property.patch
 Patch7:         update-docs.patch
+Patch8:         0001-artifact-Generate-provides-for-compat-artifacts-with.patch
 
 BuildArch:      noarch
 
@@ -147,6 +148,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 %configure
@@ -187,6 +189,9 @@ popd
 %doc LICENSE
 
 %changelog
+* Tue Jun 10 2014 Michal Srb <msrb@redhat.com> - 4.0.0-7
+- Backport fix for maven.prov
+
 * Tue Jun 10 2014 Michal Srb <msrb@redhat.com> - 4.0.0-6
 - Update docs