[xmvn/f21] Use topmost repository namespace during installation

[Mikolaj Izdebski]

commit fc09ea6a4eb15fe6580e754c7c5dc70996f44fa7
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed Nov 26 14:12:53 2014 +0100

    Use topmost repository namespace during installation
    
    - Resolves: rhbz#1166743

 0001-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch |    2 +-
 ...-repository-namespace-during-installation.patch |   26 ++++++++++++++++++++
 xmvn.spec                                          |    8 +++++-
 3 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/0001-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch b/0001-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch
index a810a10..f06861a 100644
--- a/0001-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch
+++ b/0001-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch
@@ -1,7 +1,7 @@
 From 05558e2ff3002f3a3333ee71a5b507f6f3ae93ab Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Tue, 28 Oct 2014 16:55:25 +0100
-Subject: [PATCH] Fix conversion of Ivy to XMvn artifacts
+Subject: [PATCH 1/2] Fix conversion of Ivy to XMvn artifacts
 
 Classifiers could be lost is some cases when converting Ivy artifact
 to XMvn artifact.
diff --git a/0002-Use-topmost-repository-namespace-during-installation.patch b/0002-Use-topmost-repository-namespace-during-installation.patch
new file mode 100644
index 0000000..5f86581
--- /dev/null
+++ b/0002-Use-topmost-repository-namespace-during-installation.patch
@@ -0,0 +1,26 @@
+From 3bfd72d670b7205ee3bd75083c3b2627d5f787d2 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Wed, 26 Nov 2014 14:10:51 +0100
+Subject: [PATCH 2/2] Use topmost repository namespace during installation
+
+Resolves: rhbz#1166743
+---
+ .../fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java
+index 38a5eab..0775334 100644
+--- a/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java
++++ b/xmvn-tools/xmvn-install/src/main/java/org/fedoraproject/xmvn/tools/install/impl/DefaultArtifactInstaller.java
+@@ -145,7 +145,7 @@ public class DefaultArtifactInstaller
+         }
+ 
+         // Namespace
+-        am.setNamespace( repoPaths.iterator().next().getRepository().getNamespace() );
++        am.setNamespace( repo.getNamespace() );
+ 
+         // UUID
+         am.setUuid( UUID.randomUUID().toString() );
+-- 
+1.9.3
+
diff --git a/xmvn.spec b/xmvn.spec
index 684cea4..170aba4 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -1,6 +1,6 @@
 Name:           xmvn
 Version:        2.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Local Extensions for Apache Maven
 License:        ASL 2.0
 URL:            http://mizdebsk.fedorapeople.org/xmvn
@@ -9,6 +9,7 @@ BuildArch:      noarch
 Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz
 
 Patch0:         0001-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch
+Patch1:         0002-Use-topmost-repository-namespace-during-installation.patch
 
 BuildRequires:  maven >= 3.2.1-10
 BuildRequires:  maven-local
@@ -139,6 +140,7 @@ This package provides %{summary}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %mvn_package :xmvn __noinstall
 
@@ -286,6 +288,10 @@ end
 %doc LICENSE NOTICE
 
 %changelog
+* Wed Nov 26 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.0.1-3
+- Use topmost repository namespace during installation
+- Resolves: rhbz#1166743
+
 * Tue Oct 28 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.0.1-2
 - Fix conversion of Ivy to XMvn artifacts
 - Resolves: rhbz#1127804