6c088e
From 8c19c2aeaf637d39ade97c6b644ca174b3a8a8d0 Mon Sep 17 00:00:00 2001
6c088e
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
6c088e
Date: Tue, 11 Feb 2014 11:33:17 +0100
6c088e
Subject: [PATCH 3/3] [macros] Fix xmvn-install for SCL usage
6c088e
6c088e
The passed package name was incorrect for xmvn-install
6c088e
---
6c088e
 etc/macros.xmvn | 2 +-
6c088e
 1 file changed, 1 insertion(+), 1 deletion(-)
6c088e
6c088e
diff --git a/etc/macros.xmvn b/etc/macros.xmvn
6c088e
index 5ec8123..707dac2 100644
6c088e
--- a/etc/macros.xmvn
6c088e
+++ b/etc/macros.xmvn
6c088e
@@ -141,7 +141,7 @@
6c088e
 # buildroot. It is intended to be placed in %install section of spec file.
6c088e
 #
6c088e
 %mvn_install(J:X) \
6c088e
-xmvn-install %{?-X} -R .xmvn-reactor -n "${RPM_PACKAGE_NAME}" -d "%{buildroot}" \
6c088e
+xmvn-install %{?-X} -R .xmvn-reactor -n %{?scl:%{pkg_name}}%{!?scl:%{name}} -d "%{buildroot}" \
6c088e
 jdir="%{-J*:%{-J*}}%{!-J*:target/site/apidocs}" \
6c088e
 if [ -d "${jdir}" ]; then \
6c088e
    install -dm755 %{buildroot}%{_javadocdir}/%{name} \
6c088e
-- 
6c088e
1.9.0
6c088e