Backport abrt-java-connector changes

0001-Fix-traceback-on-corrupt-zipfile.patch

@@ -1,7 +1,7 @@
-From 0a6c462323557dbd2f2b04dc0a96412643244e35 Mon Sep 17 00:00:00 2001
+From 80e8bf4344417f55510bc6f8ee29af7014b024ca Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 16 Aug 2017 15:20:29 +0200
-Subject: [PATCH] Fix traceback on corrupt zipfile
+Subject: [PATCH 1/2] Fix traceback on corrupt zipfile
 
 Resolves: rhbz#1481005
 ---
@@ -9,7 +9,7 @@ Resolves: rhbz#1481005
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/python/javapackages/common/manifest.py b/python/javapackages/common/manifest.py
-index 9a27ff87..5a6245b9 100644
+index 9a27ff8..5a6245b 100644
 --- a/python/javapackages/common/manifest.py
 +++ b/python/javapackages/common/manifest.py
 @@ -33,7 +33,7 @@
@@ -31,5 +31,5 @@ index 9a27ff87..5a6245b9 100644
          if mf is None:
              return None
 -- 
-2.13.5
+2.17.0
 

0002-Backport-abrt-java-connector-changes.patch

@@ -0,0 +1,70 @@
+From 86f81bb751bedd9d3b3ecf98f0492d3446d808dd Mon Sep 17 00:00:00 2001
+From: Matej Habrnal <mhabrnal@redhat.com>
+Date: Wed, 2 May 2018 11:47:16 +0200
+Subject: [PATCH 2/2] Backport abrt-java-connector changes
+
+Squashed from:
+
+change abrt-java-connector upstream URL
+
+abrt-java-connector upstream repository was moved from
+https://github.com/jfilak/abrt-java-connector/ to
+https://github.com/abrt/abrt-java-connector/
+
+Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
+
+extend ABRT Java agent options
+
+If ABRT Java agent is enabled and container-exception-logger is
+installed, pass cel=on parameter to libabrt-java-connector.so.
+
+Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
+---
+ etc/java.conf             |  2 +-
+ java-utils/java-functions | 18 +++++++++++++-----
+ 2 files changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/etc/java.conf b/etc/java.conf
+index 6af623a..81b24aa 100644
+--- a/etc/java.conf
++++ b/etc/java.conf
+@@ -13,5 +13,5 @@ JNI_LIBDIR=@{jnidir}
+ #JAVACMD_OPTS=
+ 
+ # You can disable ABRT Java Connector by setting JAVA_ABRT to "off".
+-# See: https://github.com/jfilak/abrt-java-connector/
++# See: https://github.com/abrt/abrt-java-connector/
+ #JAVA_ABRT=off
+diff --git a/java-utils/java-functions b/java-utils/java-functions
+index 0c157cc..eafcdd6 100644
+--- a/java-utils/java-functions
++++ b/java-utils/java-functions
+@@ -106,12 +106,20 @@ _load_java_conf()
+ 	JAVACMD_OPTS="${java_opts_save}"
+     fi
+ 
+-    if [ "_${JAVA_ABRT}" != "_off" -a -f "@{abrtlibdir}/libabrt-java-connector.so" -a -f "@{rundir}/abrt/abrtd.pid" ]; then
+-	_log "ABRT Java connector was enabled"
+-	_log "Using ABRT Java agent: @{abrtlibdir}/libabrt-java-connector.so"
+-	JAVACMD_OPTS="${JAVACMD_OPTS} -agentpath:@{abrtlibdir}/libabrt-java-connector.so=abrt=on"
++    if [ "_${JAVA_ABRT}" != "_off" -a -f "@{abrtlibdir}/libabrt-java-connector.so" ]; then
++        if [ -f "@{rundir}/abrt/abrtd.pid" ]; then
++            ABRT_JAVA_CONNECTOR_OPTS="abrt=on,"
++        fi
++        if [ -f "@{bindir}/container-exception-logger" ]; then
++            ABRT_JAVA_CONNECTOR_OPTS+="cel=on"
++        fi
++        if [ ! -z ${ABRT_JAVA_CONNECTOR_OPTS} ]; then
++            _log "ABRT Java connector was enabled"
++            _log "Using ABRT Java agent: @{abrtlibdir}/libabrt-java-connector.so=${ABRT_JAVA_CONNECTOR_OPTS}"
++            JAVACMD_OPTS="${JAVACMD_OPTS} -agentpath:@{abrtlibdir}/libabrt-java-connector.so=${ABRT_JAVA_CONNECTOR_OPTS}"
++        fi
+     else
+-	_log "ABRT Java connector is disabled"
++        _log "ABRT Java connector is disabled"
+     fi
+ }
+ 
+-- 
+2.17.0
+

javapackages-tools.spec

@@ -21,7 +21,7 @@
 
 Name:           javapackages-tools
 Version:        5.0.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -29,6 +29,8 @@ License:        BSD
 URL:            https://github.com/fedora-java/javapackages
 Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
 Patch0:         0001-Fix-traceback-on-corrupt-zipfile.patch
+# https://github.com/fedora-java/javapackages/pull/55
+Patch1:         0002-Backport-abrt-java-connector-changes.patch
 
 BuildArch:      noarch
 
@@ -144,6 +146,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %setup -q -n javapackages-%{version}
 
 %patch0 -p1
+%patch1 -p1
 
 %if %{without asciidoc}
 sed -i '/^manpage /d' build
@@ -193,6 +196,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
 %license LICENSE
 
 %changelog
+* Wed May 02 2018 Michael Simacek <msimacek@redhat.com> - 5.0.0-13
+- Backport abrt-java-connector changes
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5.0.0-12
 - Escape macros in %%changelog