Improve support for SCLs

0003-macros-Fix-add_maven_depmap-for-SCL-usage.patch

@@ -0,0 +1,38 @@
+From cf8978c21d0a6f0bf9a00983f123597c8bb331b6 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb@redhat.com>
+Date: Wed, 12 Feb 2014 18:24:13 +0100
+Subject: [PATCH 2/3] [macros] Fix add_maven_depmap for SCL usage
+
+Use %{pkg_name} when calling without arguments
+Let's make sure we install fragment file without prefix
+---
+ etc/macros.fjava | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/etc/macros.fjava b/etc/macros.fjava
+index bdfd624..e2a41e6 100644
+--- a/etc/macros.fjava
++++ b/etc/macros.fjava
+@@ -52,8 +52,8 @@
+ set -e \
+ # default values \
+ %if %# == 0 \
+-   _pompart="JPP-%{name}.pom" \
+-   _jarpart="%{name}.jar" \
++   _pompart="JPP-%{?scl:%{pkg_name}}%{!?scl:%{name}}.pom" \
++   _jarpart="%{?scl:%{pkg_name}}%{!?scl:%{name}}.jar" \
+ %else \
+    _pompart="%1" \
+    _jarpart="%2" \
+@@ -67,7 +67,7 @@ for _dir in %{_jnidir} %{_javajnidir} %{_javadir}; do \
+ done \
+ python -m %{javadir}-utils/maven_depmap %{-a} %{-v*:-r %{-v*}} \\\
+           -p "%{_prefix}" -n "%{?scl}" \\\
+-          %{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
++          %{buildroot}%{_mavendepmapfragdir}/%{?scl:%{pkg_name}}%{!?scl:%{name}}%{-f*:-%{-f*}} \\\
+           %{buildroot}%{_mavenpomdir}/$_pompart \\\
+ %if %# == 2 \
+           "${_jpath}" \\\
+-- 
+1.8.5.3
+

0004-macros-Fix-xmvn-install-for-SCL-usage.patch

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

javapackages-tools.spec

@@ -1,6 +1,6 @@
 Name:           javapackages-tools
 Version:        3.5.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -14,6 +14,9 @@ Patch0:         0001-Add-support-for-installing-hpi.patch
 Patch1:         0001-depgenerators-Switch-to-require-java-headless-instea.patch
 Patch2:         0002-test-Fix-testsuite-for-java-headless-change.patch
 
+Patch3:         0003-macros-Fix-add_maven_depmap-for-SCL-usage.patch
+Patch4:         0004-macros-Fix-xmvn-install-for-SCL-usage.patch
+
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils
@@ -124,6 +127,8 @@ Requires:       fedora-review
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %configure
@@ -161,6 +166,9 @@ popd
 
 
 %changelog
+* Wed Apr 30 2014 Michal Srb <msrb@redhat.com> - 3.5.0-7
+- Improve support for SCLs
+
 * Wed Apr 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.0-6
 - Add explicit maven-local requires on java-1.8.0-openjdk-devel