[javapackages-tools] Fix path to ABRT agent DSO

[Mikolaj Izdebski]

commit 532a3d6f1c0074273bd13d4819561d90271b3743
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Oct 30 15:57:38 2014 +0100

    Fix path to ABRT agent DSO

 ...t-Append-dependencies-to-metadata-if-we-h.patch |    2 +-
 ...pper-script-to-inject-extra-JVM-arguments.patch |    2 +-
 ...cture-independent-location-of-abrt-java-c.patch |   69 ++++++++++++++++++++
 javapackages-tools.spec                            |    3 +
 4 files changed, 74 insertions(+), 2 deletions(-)
---
diff --git a/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch b/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch
index a980643..791ff21 100644
--- a/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch
+++ b/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch
@@ -1,7 +1,7 @@
 From eafaa146aace0885d17ff472db0a63aef75f2ce5 Mon Sep 17 00:00:00 2001
 From: Michal Srb <msrb at redhat.com>
 Date: Thu, 18 Sep 2014 10:48:07 +0200
-Subject: [PATCH 1/2] [mvn_artifact] Append dependencies to metadata, if we
+Subject: [PATCH 1/3] [mvn_artifact] Append dependencies to metadata, if we
  have them
 
 ---
diff --git a/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch b/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch
index aefdebc..64669f8 100644
--- a/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch
+++ b/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch
@@ -1,7 +1,7 @@
 From dee96bf521cdbae4c80ee328968e1ff5200f2aab Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Thu, 30 Oct 2014 15:20:20 +0100
-Subject: [PATCH 2/2] Use wrapper script to inject extra JVM arguments
+Subject: [PATCH 2/3] Use wrapper script to inject extra JVM arguments
 
 ---
  install                   |  1 +
diff --git a/0003-Use-architecture-independent-location-of-abrt-java-c.patch b/0003-Use-architecture-independent-location-of-abrt-java-c.patch
new file mode 100644
index 0000000..9c57283
--- /dev/null
+++ b/0003-Use-architecture-independent-location-of-abrt-java-c.patch
@@ -0,0 +1,69 @@
+From 97ee162d443fd954208c277c43f7195339b01e8d Mon Sep 17 00:00:00 2001
+From: Jakub Filak <jfilak at redhat.com>
+Date: Thu, 30 Oct 2014 08:36:56 +0100
+Subject: [PATCH 3/3] Use architecture-independent location of
+ abrt-java-connector
+
+The connector's library has been moved to architecture-independent
+directory /usr/lib/abrt-java-connector/, because Java does not
+officially support multilib and having the connector installed the arch
+specific directory was causing us problems if Java package doesn't match
+host architecture (e.g. Java i386 on host x86_64).
+
+Signed-off-by: Jakub Filak <jfilak at redhat.com>
+---
+ build                     | 1 +
+ configure                 | 2 ++
+ java-utils/java-functions | 4 ++--
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build b/build
+index 3f5631a..336ac2a 100755
+--- a/build
++++ b/build
+@@ -65,6 +65,7 @@ expand()
+         -e "s|%{rundir}|${rundir}|" \
+         -e "s|%{sysconfdir}|${sysconfdir}|" \
+         -e "s|%{pyinterpreter}|${pyinterpreter}|" \
++        -e "s|%{abrtlibdir}|${abrtlibdir}|" \
+         "${1}" >"${target}"
+ }
+ 
+diff --git a/configure b/configure
+index cc8b0a1..ab9388d 100755
+--- a/configure
++++ b/configure
+@@ -69,6 +69,7 @@ jvmprivdir
+ jvmsysconfdir
+ mavenpomdir
+ pyinterpreter
++abrtlibdir
+ "
+ 
+ vars="$vars mavendepmapdir mavendepmapfragdir" # @Deprecated
+@@ -90,6 +91,7 @@ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
+ 
+ test -z "${m2home}" && m2home="${datadir}/xmvn"
+ test -z "${pyinterpreter}" && set_pyinterpreter
++test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector"
+ 
+ eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.jpackage)
+ 
+diff --git a/java-utils/java-functions b/java-utils/java-functions
+index c57640f..8397d2c 100644
+--- a/java-utils/java-functions
++++ b/java-utils/java-functions
+@@ -110,8 +110,8 @@ _load_java_conf()
+ 	JAVACMD_OPTS="${java_opts_save}"
+     fi
+ 
+-    if [ "_${JAVA_ABRT}" != "_off" ] && [ -f %{libdir}/libabrt-java-connector.so ] && [ -f %{rundir}/abrt/abrtd.pid ]; then
+-	JAVACMD_OPTS="${JAVACMD_OPTS} -agentpath:%{libdir}/libabrt-java-connector.so=abrt=on"
++    if [ "_${JAVA_ABRT}" != "_off" ] && [ -f %{abrtlibdir}/libabrt-java-connector.so ] && [ -f %{rundir}/abrt/abrtd.pid ]; then
++	JAVACMD_OPTS="${JAVACMD_OPTS} -agentpath:%{abrtlibdir}/libabrt-java-connector.so=abrt=on"
+     fi
+ }
+ 
+-- 
+1.9.3
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 00c6ef0..bbb6c10 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -18,6 +18,7 @@ Patch0:         0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch
 Patch1:         0001-metadata-Read-OSGi-Requires-from-manifest-only-if-os.patch
 Patch2:         0001-pom_editor-Fix-missing-space-between-xmlns-declarati.patch
 Patch3:         0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch
+Patch4:         0003-Use-architecture-independent-location-of-abrt-java-c.patch
 
 BuildArch:      noarch
 
@@ -173,6 +174,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %if 0%{?with_python3}
 find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
@@ -240,6 +242,7 @@ popd
 %changelog
 * Thu Oct 30 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 4.2.0-5
 - Use wrapper script to inject ABRT agent JVM argument
+- Fix path to ABRT agent DSO
 - Resolves: rhbz#1153652
 
 * Tue Oct 21 2014 Michael Simacek <msimacek at redhat.com> - 4.2.0-4