import abrt-java-connector-1.1.0-16.el8
This commit is contained in:
parent
cd08d20a3e
commit
ab3cbc1cca
50
SOURCES/0017-build-update-pkg-modules-for-systemd.patch
Normal file
50
SOURCES/0017-build-update-pkg-modules-for-systemd.patch
Normal file
@ -0,0 +1,50 @@
|
||||
From c0d934651f0fb01687035c8750f0591ea8b5d0ee Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Filak <jfilak@redhat.com>
|
||||
Date: Mon, 23 May 2016 14:28:40 +0200
|
||||
Subject: [PATCH] build: update pkg modules for systemd
|
||||
|
||||
systemd-journal was dropped in systemd-230
|
||||
|
||||
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
||||
---
|
||||
src/CMakeLists.txt | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 1d31602..36c9ce5 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -4,14 +4,14 @@ include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
|
||||
include_directories(${PC_LIBREPORT_INCLUDE_DIRS})
|
||||
include_directories(${PC_ABRT_INCLUDE_DIRS})
|
||||
|
||||
-pkg_check_modules(PC_JOURNALD libsystemd-journal)
|
||||
+pkg_check_modules(PC_SYSTEMD libsystemd)
|
||||
|
||||
-if (PC_JOURNALD_FOUND)
|
||||
- include_directories(${PC_JOURNALD_INCLUDE_DIRS})
|
||||
+if (PC_SYSTEMD_FOUND)
|
||||
+ include_directories(${PC_SYSTEMD_INCLUDE_DIRS})
|
||||
add_definitions(-DHAVE_SYSTEMD=1)
|
||||
else()
|
||||
add_definitions(-DHAVE_SYSTEMD=0)
|
||||
-endif (PC_JOURNALD_FOUND)
|
||||
+endif (PC_SYSTEMD_FOUND)
|
||||
|
||||
set(AbrtChecker_SRCS configuration.c abrt-checker.c
|
||||
jthrowable_circular_buf.c jthread_map.c)
|
||||
@@ -27,8 +27,8 @@ set_target_properties(
|
||||
target_link_libraries(AbrtChecker ${PC_LIBREPORT_LIBRARIES})
|
||||
target_link_libraries(AbrtChecker ${PC_ABRT_LIBRARIES})
|
||||
|
||||
-if (PC_JOURNALD_FOUND)
|
||||
- target_link_libraries(AbrtChecker ${PC_JOURNALD_LIBRARIES})
|
||||
-endif (PC_JOURNALD_FOUND)
|
||||
+if (PC_SYSTEMD_FOUND)
|
||||
+ target_link_libraries(AbrtChecker ${PC_SYSTEMD_LIBRARIES})
|
||||
+endif (PC_SYSTEMD_FOUND)
|
||||
|
||||
install(TARGETS AbrtChecker DESTINATION ${JNIAGENTLIB_INSTALL_DIR})
|
||||
--
|
||||
2.21.0
|
||||
|
37
SOURCES/0018-abrt-checker-Fix-preprocessor-check.patch
Normal file
37
SOURCES/0018-abrt-checker-Fix-preprocessor-check.patch
Normal file
@ -0,0 +1,37 @@
|
||||
From ae2144f1674f163517f0aa18b5f1b4784c143572 Mon Sep 17 00:00:00 2001
|
||||
From: Ernestas Kulik <ekulik@redhat.com>
|
||||
Date: Fri, 19 Jul 2019 15:24:17 +0200
|
||||
Subject: [PATCH] abrt-checker: Fix preprocessor check
|
||||
|
||||
The macro defined is HAVE_SYSTEMD, not HAVE_SYSTEMD_JOURNAL.
|
||||
|
||||
Signed-off-by: Ernestas Kulik <ekulik@redhat.com>
|
||||
---
|
||||
src/abrt-checker.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/abrt-checker.c b/src/abrt-checker.c
|
||||
index 6f7fe13..2a0fac2 100644
|
||||
--- a/src/abrt-checker.c
|
||||
+++ b/src/abrt-checker.c
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <errno.h>
|
||||
#include <syslog.h>
|
||||
|
||||
-#if HAVE_SYSTEMD_JOURNAL
|
||||
+#if HAVE_SYSTEMD
|
||||
#include <systemd/sd-journal.h>
|
||||
#endif
|
||||
|
||||
@@ -802,7 +802,7 @@ static void report_stacktrace(
|
||||
syslog(LOG_ERR, "%s\n%s", message, stacktrace);
|
||||
}
|
||||
|
||||
-#if HAVE_SYSTEMD_JOURNAL
|
||||
+#if HAVE_SYSTEMD
|
||||
if (globalConfig.reportErrosTo & ED_JOURNALD)
|
||||
{
|
||||
VERBOSE_PRINT("Reporting stack trace to JournalD\n");
|
||||
--
|
||||
2.21.0
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
Name: abrt-java-connector
|
||||
Version: 1.1.0
|
||||
Release: 15%{?dist}
|
||||
Release: 16%{?dist}
|
||||
Summary: JNI Agent library converting Java exceptions to ABRT problems
|
||||
|
||||
Group: System Environment/Libraries
|
||||
@ -41,6 +41,8 @@ Patch0013: 0013-Correct-includes-for-ABRT.patch
|
||||
Patch0014: 0014-Drop-pedantic-from-CFLAGS.patch
|
||||
Patch0015: 0015-Rename-log-to-log_warning.patch
|
||||
Patch0016: 0016-Update-the-test-results.patch
|
||||
Patch0017: 0017-build-update-pkg-modules-for-systemd.patch
|
||||
Patch0018: 0018-abrt-checker-Fix-preprocessor-check.patch
|
||||
|
||||
%description
|
||||
JNI library providing an agent capable to process both caught and uncaught
|
||||
@ -93,6 +95,10 @@ make test || {
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 19 2019 Ernestas Kulik <ekulik@redhat.com> - 1.1.0-16
|
||||
- Add patch for #1721393
|
||||
- Add patch for https://github.com/abrt/abrt-java-connector/commit/ae2144f1674f163517f0aa18b5f1b4784c143572
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user