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