From fcb49031a1d17afe3c0250bbd29e26127c676896 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 14 2014 08:16:54 +0000
Subject: import javapackages-tools-3.4.1-6.el7_0


---

diff --git a/SOURCES/0001-Support-absolute-symlinks-in-SCLs-in-mvn_file-rhbz-1.patch b/SOURCES/0001-Support-absolute-symlinks-in-SCLs-in-mvn_file-rhbz-1.patch
index 8bdb3c9..107ee22 100644
--- a/SOURCES/0001-Support-absolute-symlinks-in-SCLs-in-mvn_file-rhbz-1.patch
+++ b/SOURCES/0001-Support-absolute-symlinks-in-SCLs-in-mvn_file-rhbz-1.patch
@@ -1,7 +1,8 @@
 From 6405dfa42ff8d12fb6f810041aa89243f6ae7433 Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky@redhat.com>
 Date: Wed, 4 Dec 2013 17:47:06 +0100
-Subject: [PATCH] Support absolute symlinks in SCLs in mvn_file (rhbz#1038553)
+Subject: [PATCH 1/3] Support absolute symlinks in SCLs in mvn_file
+ (rhbz#1038553)
 
 ---
  java-utils/mvn_file.py                 | 11 +++++------
@@ -149,5 +150,5 @@ index 09a2648..4792497 100644
  if __name__ == '__main__':
      unittest.main()
 -- 
-1.8.4.2
+1.9.0
 
diff --git a/SOURCES/0002-macros-Fix-add_maven_depmap-for-SCL-usage.patch b/SOURCES/0002-macros-Fix-add_maven_depmap-for-SCL-usage.patch
new file mode 100644
index 0000000..51a185e
--- /dev/null
+++ b/SOURCES/0002-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.9.0
+
diff --git a/SOURCES/0003-macros-Fix-xmvn-install-for-SCL-usage.patch b/SOURCES/0003-macros-Fix-xmvn-install-for-SCL-usage.patch
new file mode 100644
index 0000000..0a8cd69
--- /dev/null
+++ b/SOURCES/0003-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.9.0
+
diff --git a/SPECS/javapackages-tools.spec b/SPECS/javapackages-tools.spec
index 655ea6a..c3724ab 100644
--- a/SPECS/javapackages-tools.spec
+++ b/SPECS/javapackages-tools.spec
@@ -1,6 +1,6 @@
 Name:           javapackages-tools
 Version:        3.4.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -10,6 +10,9 @@ Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{ve
 
 # rhbz 1038553
 Patch1:         0001-Support-absolute-symlinks-in-SCLs-in-mvn_file-rhbz-1.patch
+# rhbz 1098523 (two patches)
+Patch2:         0002-macros-Fix-add_maven_depmap-for-SCL-usage.patch
+Patch3:         0003-macros-Fix-xmvn-install-for-SCL-usage.patch
 
 BuildArch:      noarch
 
@@ -87,6 +90,8 @@ sed -i '/fedora-review/d' install
 sed -i 's:\(inst_exec target/mvn-local\).*:\1 ${javadir}-utils:' install
 
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure
@@ -128,6 +133,10 @@ rm -rf %{buildroot}/%{_datadir}/fedora-review/
 
 
 %changelog
+* Fri May 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.1-6
+- Fix add_maven_depmap and xmvn-install for SCL usage
+- Resolves: rhbz#1098523
+
 * Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 3.4.1-5
 - Mass rebuild 2013-12-27