- Update 9100 almalinux support patch
- Delete 9101 patch(The patch is no longer needed)
This commit is contained in:
eabdullin
parent
20e04b2f3b
commit
8ee7293b9a
@ -15,9 +15,6 @@ Subject: [PATCH] Add AlmaLinux plugin
|
||||
src/plugins/report_AlmaLinuxBugTracker.conf | 4 +
|
||||
src/plugins/report_AlmaLinuxBugTracker.xml | 543 ++++++++++++++++++
|
||||
src/plugins/report_AlmaLinuxBugTracker.xml.in | 66 +++
|
||||
src/plugins/report_EmergencyAnalysis.xml | 4 +-
|
||||
src/plugins/report_uReport.xml | 4 +-
|
||||
src/plugins/report_uReport.xml.in | 2 +-
|
||||
src/plugins/reporter-mantisbt.c | 4 +-
|
||||
src/plugins/reporter-ureport.c | 2 +-
|
||||
src/plugins/ureport.conf | 2 +-
|
||||
@ -73,26 +70,33 @@ diff --git a/doc/Makefile.am b/doc/Makefile.am
|
||||
index 837036b..a3ec01b 100644
|
||||
--- a/doc/Makefile.am
|
||||
+++ b/doc/Makefile.am
|
||||
@@ -51,7 +51,9 @@ MAN5_TXT += libreport.conf.txt
|
||||
MAN5_TXT += mailx.conf.txt
|
||||
MAN5_TXT += mailx_event.conf.txt
|
||||
MAN5_TXT += print_event.conf.txt
|
||||
+MAN5_TXT += report_AlmaLinuxBugTracker.conf.txt
|
||||
MAN5_TXT += report_Bugzilla.conf.txt
|
||||
+MAN5_TXT += report_almalinux.conf.txt
|
||||
MAN5_TXT += report_event.conf.txt
|
||||
MAN5_TXT += report_fedora.conf.txt
|
||||
MAN5_TXT += report_centos.conf.txt
|
||||
@@ -71,7 +73,8 @@ MAN5_TXT += ureport.conf.txt
|
||||
MAN5_TXT += upload.conf.txt
|
||||
@@ -51,6 +51,7 @@
|
||||
mailx_event.conf.txt \
|
||||
print_event.conf.txt \
|
||||
report_event.conf.txt \
|
||||
+ report_almalinux.conf.txt \
|
||||
report_fedora.conf.txt \
|
||||
report_centos.conf.txt \
|
||||
report_Logger.conf.txt \
|
||||
@@ -61,6 +62,7 @@
|
||||
report_uploader.conf.txt \
|
||||
report_Uploader.conf.txt \
|
||||
report_CentOSBugTracker.conf.txt \
|
||||
+ report_AlmaLinuxBugTracker.conf.txt \
|
||||
uploader_event.conf.txt \
|
||||
ureport.conf.txt \
|
||||
upload.conf.txt
|
||||
@@ -73,7 +75,8 @@
|
||||
endif
|
||||
|
||||
MAN5_PREFORMATTED =
|
||||
-MAN5_PREFORMATTED += centos_report_event.conf.5
|
||||
+MAN5_PREFORMATTED += centos_report_event.conf.5 \
|
||||
+ almalinux_report_event.conf.5
|
||||
+ almalinux_report_event.conf.5
|
||||
|
||||
# Manual pages are generated from .txt via Docbook
|
||||
man1_MANS = ${MAN1_TXT:%.txt=%.1}
|
||||
|
||||
diff --git a/doc/almalinux_report_event.conf.5 b/doc/almalinux_report_event.conf.5
|
||||
new file mode 100644
|
||||
index 0000000..71c3fcb
|
||||
@ -202,7 +206,7 @@ diff --git a/po/POTFILES.in b/po/POTFILES.in
|
||||
index fc740ff..5a3306f 100644
|
||||
--- a/po/POTFILES.in
|
||||
+++ b/po/POTFILES.in
|
||||
@@ -45,6 +45,7 @@ src/plugins/reporter-rhtsupport-parse.c
|
||||
@@ -41,6 +41,7 @@
|
||||
src/plugins/reporter-systemd-journal.c
|
||||
src/plugins/reporter-upload.c
|
||||
src/plugins/reporter-mantisbt.c
|
||||
@ -210,7 +214,7 @@ index fc740ff..5a3306f 100644
|
||||
src/plugins/report_CentOSBugTracker.xml.in
|
||||
src/plugins/report_Kerneloops.xml.in
|
||||
src/plugins/report_Logger.xml.in
|
||||
@@ -59,6 +60,15 @@ src/plugins/rhbz.c
|
||||
@@ -52,6 +53,15 @@
|
||||
src/plugins/mantisbt.c
|
||||
src/plugins/reporter-ureport.c
|
||||
src/report-newt/report-newt.c
|
||||
@ -224,13 +228,13 @@ index fc740ff..5a3306f 100644
|
||||
+src/workflows/workflow_AlmaLinuxVmcore.xml.in
|
||||
+src/workflows/workflow_AlmaLinuxXorg.xml.in
|
||||
src/workflows/workflow_AnacondaFedora.xml.in
|
||||
src/workflows/workflow_AnacondaRHEL.xml.in
|
||||
src/workflows/workflow_AnacondaRHELBugzilla.xml.in
|
||||
src/workflows/workflow_AnacondaUpload.xml.in
|
||||
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
|
||||
index f73e7dc..695a056 100644
|
||||
--- a/src/plugins/Makefile.am
|
||||
+++ b/src/plugins/Makefile.am
|
||||
@@ -70,9 +70,11 @@ reporters_events_conf += report_Bugzilla.conf
|
||||
@@ -68,9 +68,11 @@
|
||||
endif
|
||||
|
||||
if BUILD_MANTISBT
|
||||
@ -240,21 +244,21 @@ index f73e7dc..695a056 100644
|
||||
|
||||
-reporters_events_conf += report_CentOSBugTracker.conf
|
||||
+reporters_events_conf += report_CentOSBugTracker.conf \
|
||||
+ report_AlmaLinuxBugTracker.conf
|
||||
+ report_AlmaLinuxBugTracker.conf
|
||||
endif
|
||||
|
||||
if BUILD_UREPORT
|
||||
@@ -102,7 +104,8 @@ dist_eventsdef_DATA = \
|
||||
rhtsupport_event.conf \
|
||||
@@ -95,7 +97,8 @@
|
||||
mailx_event.conf \
|
||||
print_event.conf \
|
||||
uploader_event.conf \
|
||||
emergencyanalysis_event.conf \
|
||||
- centos_report_event.conf
|
||||
+ centos_report_event.conf \
|
||||
+ almalinux_report_event.conf
|
||||
+ almalinux_report_event.conf
|
||||
|
||||
reporters_extra_dist =
|
||||
if BUILD_BUGZILLA
|
||||
@@ -116,7 +119,8 @@ reporters_extra_dist += report_uReport.xml.in
|
||||
@@ -109,7 +112,8 @@
|
||||
endif
|
||||
|
||||
if BUILD_MANTISBT
|
||||
@ -312,8 +316,8 @@ diff --git a/src/plugins/mantisbt.c b/src/plugins/mantisbt.c
|
||||
index 1750dc5..92804d4 100644
|
||||
--- a/src/plugins/mantisbt.c
|
||||
+++ b/src/plugins/mantisbt.c
|
||||
@@ -336,7 +336,7 @@ soap_add_new_issue_parameters(soap_request_t *req,
|
||||
free(type);
|
||||
@@ -335,7 +335,7 @@
|
||||
error_msg_and_die(_("SOAP: Failed to create a new property in custom fields."));
|
||||
}
|
||||
|
||||
- soap_node_add_child_node(issue_node, "os_build", SOAP_STRING, version);
|
||||
@ -321,7 +325,7 @@ index 1750dc5..92804d4 100644
|
||||
soap_node_add_child_node(issue_node, "category", SOAP_STRING, category);
|
||||
soap_node_add_child_node(issue_node, "summary", SOAP_STRING, summary);
|
||||
soap_node_add_child_node(issue_node, "description", SOAP_STRING, description);
|
||||
@@ -891,7 +891,7 @@ mantisbt_search_duplicate_issues(mantisbt_settings_t *settings, const char *cate
|
||||
@@ -862,7 +862,7 @@
|
||||
|
||||
// version
|
||||
if (version != NULL)
|
||||
@ -961,76 +965,23 @@ index 0000000..2e7a246
|
||||
+ </advanced-options>
|
||||
+ </options>
|
||||
+</event>
|
||||
diff --git a/src/plugins/report_EmergencyAnalysis.xml b/src/plugins/report_EmergencyAnalysis.xml
|
||||
index c129404..b9d87e8 100644
|
||||
--- a/src/plugins/report_EmergencyAnalysis.xml
|
||||
+++ b/src/plugins/report_EmergencyAnalysis.xml
|
||||
@@ -111,7 +111,7 @@
|
||||
<label xml:lang="zh_CN">URL</label>
|
||||
<label xml:lang="zh_TW">URL</label>
|
||||
<allow-empty>no</allow-empty>
|
||||
- <default-value>https://retrace.fedoraproject.org/faf/dumpdirs/new/</default-value>
|
||||
+ <default-value>https://localhost/faf/dumpdirs/new/</default-value>
|
||||
</option>
|
||||
<advanced-options>
|
||||
<option type="text" name="http_proxy">
|
||||
@@ -301,4 +301,4 @@
|
||||
</option>
|
||||
</advanced-options>
|
||||
</options>
|
||||
-</event>
|
||||
\ No newline at end of file
|
||||
+</event>
|
||||
diff --git a/src/plugins/report_uReport.xml b/src/plugins/report_uReport.xml
|
||||
index 80b8daa..302a0bb 100644
|
||||
--- a/src/plugins/report_uReport.xml
|
||||
+++ b/src/plugins/report_uReport.xml
|
||||
@@ -134,7 +134,7 @@
|
||||
<description xml:lang="uk">Адреса вебслужби uReport</description>
|
||||
<description xml:lang="zh_CN">uReport 网络服务器地址</description>
|
||||
<description xml:lang="zh_TW">uReport 網路服務的位址</description>
|
||||
- <default-value>https://retrace.fedoraproject.org/faf</default-value>
|
||||
+ <default-value>https://retrace.almalinux.org/faf</default-value>
|
||||
</option>
|
||||
<option type="bool" name="uReport_WatchReportedBugs">
|
||||
<label>Watch already reported bugs</label>
|
||||
@@ -426,4 +426,4 @@
|
||||
</option>
|
||||
</advanced-options>
|
||||
</options>
|
||||
-</event>
|
||||
\ No newline at end of file
|
||||
+</event>
|
||||
diff --git a/src/plugins/report_uReport.xml.in b/src/plugins/report_uReport.xml.in
|
||||
index 996f20b..430871b 100644
|
||||
--- a/src/plugins/report_uReport.xml.in
|
||||
+++ b/src/plugins/report_uReport.xml.in
|
||||
@@ -14,7 +14,7 @@
|
||||
<_label>uReport Server URL</_label>
|
||||
<allow-empty>no</allow-empty>
|
||||
<_description>Address of uReport webservice</_description>
|
||||
- <default-value>https://bug-report.redhat.com</default-value>
|
||||
+ <default-value>https://retrace.almalinux.org/faf</default-value>
|
||||
</option>
|
||||
<option type="bool" name="uReport_WatchReportedBugs">
|
||||
<_label>Watch already reported bugs</_label>
|
||||
diff --git a/src/plugins/reporter-mantisbt.c b/src/plugins/reporter-mantisbt.c
|
||||
index 67597d5..81613bf 100644
|
||||
--- a/src/plugins/reporter-mantisbt.c
|
||||
+++ b/src/plugins/reporter-mantisbt.c
|
||||
@@ -25,11 +25,11 @@
|
||||
static void
|
||||
parse_osinfo_for_mantisbt(map_string_t *osinfo, char** project, char** version)
|
||||
parse_osinfo_for_mantisbt(GHashTable *osinfo, char** project, char** version)
|
||||
{
|
||||
- const char *name = get_map_string_item_or_NULL(osinfo, "CENTOS_MANTISBT_PROJECT");
|
||||
+ const char *name = get_map_string_item_or_NULL(osinfo, "ALMALINUX_MANTISBT_PROJECT");
|
||||
- const char *name = g_hash_table_lookup(osinfo, "CENTOS_MANTISBT_PROJECT");
|
||||
+ const char *name = g_hash_table_lookup(osinfo, "ALMALINUX_MANTISBT_PROJECT");
|
||||
if (!name)
|
||||
name = get_map_string_item_or_NULL(osinfo, OSINFO_NAME);
|
||||
name = g_hash_table_lookup(osinfo, OSINFO_NAME);
|
||||
|
||||
- const char *version_id = get_map_string_item_or_NULL(osinfo, "CENTOS_MANTISBT_PROJECT_VERSION");
|
||||
+ const char *version_id = get_map_string_item_or_NULL(osinfo, "ALMALINUX_MANTISBT_PROJECT_VERSION");
|
||||
- const char *version_id = g_hash_table_lookup(osinfo, "CENTOS_MANTISBT_PROJECT_VERSION");
|
||||
+ const char *version_id = g_hash_table_lookup(osinfo, "ALMALINUX_MANTISBT_PROJECT_VERSION");
|
||||
if (!version_id)
|
||||
version_id = get_map_string_item_or_NULL(osinfo, OSINFO_VERSION_ID);
|
||||
version_id = g_hash_table_lookup(osinfo, OSINFO_VERSION_ID);
|
||||
|
||||
diff --git a/src/plugins/reporter-ureport.c b/src/plugins/reporter-ureport.c
|
||||
index 0aa3324..b3c0fde 100644
|
||||
@ -1040,7 +991,7 @@ index 0aa3324..b3c0fde 100644
|
||||
#include "ureport.h"
|
||||
#include "libreport_curl.h"
|
||||
|
||||
-#define DEFAULT_WEB_SERVICE_URL "https://bug-report.redhat.com"
|
||||
-#define DEFAULT_WEB_SERVICE_URL "https://retrace.fedoraproject.org/faf"
|
||||
+#define DEFAULT_WEB_SERVICE_URL "https://retrace.almalinux.org/faf"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
@ -1051,7 +1002,7 @@ index 11f4531..b5dd95c 100644
|
||||
+++ b/src/plugins/ureport.conf
|
||||
@@ -1,5 +1,5 @@
|
||||
# Base URL to uReport server
|
||||
-# URL = https://bug-report.redhat.com
|
||||
-# URL = https://retrace.fedoraproject.org/faf
|
||||
+# URL = https://retrace.almalinux.org/faf
|
||||
|
||||
# no means that ssl certificates will not be checked
|
||||
@ -1060,51 +1011,51 @@ diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am
|
||||
index e4d7b26..4c72cef 100644
|
||||
--- a/src/workflows/Makefile.am
|
||||
+++ b/src/workflows/Makefile.am
|
||||
@@ -44,7 +44,16 @@ dist_workflows_DATA += \
|
||||
@@ -28,7 +28,16 @@
|
||||
workflow_CentOSXorg.xml \
|
||||
workflow_CentOSLibreport.xml \
|
||||
workflow_CentOSJava.xml \
|
||||
- workflow_CentOSJavaScript.xml
|
||||
+ workflow_CentOSJavaScript.xml \
|
||||
+ workflow_AlmaLinuxCCpp.xml \
|
||||
+ workflow_AlmaLinuxKerneloops.xml \
|
||||
+ workflow_AlmaLinuxPython.xml \
|
||||
+ workflow_AlmaLinuxPython3.xml \
|
||||
+ workflow_AlmaLinuxVmcore.xml \
|
||||
+ workflow_AlmaLinuxXorg.xml \
|
||||
+ workflow_AlmaLinuxLibreport.xml \
|
||||
+ workflow_AlmaLinuxJava.xml \
|
||||
+ workflow_AlmaLinuxJavaScript.xml
|
||||
+ workflow_AlmaLinuxCCpp.xml \
|
||||
+ workflow_AlmaLinuxKerneloops.xml \
|
||||
+ workflow_AlmaLinuxPython.xml \
|
||||
+ workflow_AlmaLinuxPython3.xml \
|
||||
+ workflow_AlmaLinuxVmcore.xml \
|
||||
+ workflow_AlmaLinuxXorg.xml \
|
||||
+ workflow_AlmaLinuxLibreport.xml \
|
||||
+ workflow_AlmaLinuxJava.xml \
|
||||
+ workflow_AlmaLinuxJavaScript.xml
|
||||
endif
|
||||
|
||||
if BUILD_BUGZILLA
|
||||
@@ -73,7 +82,8 @@ dist_workflowsdef_DATA =\
|
||||
@@ -54,7 +63,8 @@
|
||||
report_mailx.conf \
|
||||
report_logger.conf \
|
||||
report_uploader.conf \
|
||||
- report_centos.conf
|
||||
+ report_centos.conf \
|
||||
+ report_almalinux.conf
|
||||
+ report_almalinux.conf
|
||||
|
||||
if BUILD_BUGZILLA
|
||||
dist_workflowsdef_DATA += \
|
||||
@@ -144,5 +154,15 @@ EXTRA_DIST += \
|
||||
@@ -108,5 +118,14 @@
|
||||
workflow_CentOSXorg.xml.in \
|
||||
workflow_CentOSLibreport.xml.in \
|
||||
workflow_CentOSJava.xml.in \
|
||||
- workflow_CentOSJavaScript.xml.in
|
||||
+ workflow_CentOSJavaScript.xml.in \
|
||||
+ workflow_AlmaLinuxCCpp.xml.in \
|
||||
+ workflow_AlmaLinuxKerneloops.xml.in \
|
||||
+ workflow_AlmaLinuxPython.xml.in \
|
||||
+ workflow_AlmaLinuxPython3.xml.in \
|
||||
+ workflow_AlmaLinuxVmcore.xml.in \
|
||||
+ workflow_AlmaLinuxXorg.xml.in \
|
||||
+ workflow_AlmaLinuxLibreport.xml.in \
|
||||
+ workflow_AlmaLinuxJava.xml.in \
|
||||
+ workflow_AlmaLinuxJavaScript.xml.in
|
||||
+
|
||||
+ workflow_AlmaLinuxCCpp.xml.in \
|
||||
+ workflow_AlmaLinuxKerneloops.xml.in \
|
||||
+ workflow_AlmaLinuxPython.xml.in \
|
||||
+ workflow_AlmaLinuxPython3.xml.in \
|
||||
+ workflow_AlmaLinuxVmcore.xml.in \
|
||||
+ workflow_AlmaLinuxXorg.xml.in \
|
||||
+ workflow_AlmaLinuxLibreport.xml.in \
|
||||
+ workflow_AlmaLinuxJava.xml.in \
|
||||
+ workflow_AlmaLinuxJavaScript.xml.in
|
||||
endif
|
||||
|
||||
diff --git a/src/workflows/report_almalinux.conf b/src/workflows/report_almalinux.conf
|
||||
new file mode 100644
|
||||
index 0000000..7700894
|
||||
|
||||
@ -1,370 +0,0 @@
|
||||
From 83cd17fcf8d68f668dde6e09216472462ede5162 Mon Sep 17 00:00:00 2001
|
||||
From: Andrei Lukoshko <alukoshko@cloudlinux.com>
|
||||
Date: Tue, 2 Feb 2021 06:35:51 +0300
|
||||
Subject: [PATCH] Remove rhtsupport
|
||||
|
||||
---
|
||||
src/plugins/Makefile.am | 32 --------------
|
||||
src/plugins/Makefile.in | 107 +++-------------------------------------------
|
||||
2 files changed, 7 insertions(+), 132 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
|
||||
index b228602..2a289e7 100644
|
||||
--- a/src/plugins/Makefile.am
|
||||
+++ b/src/plugins/Makefile.am
|
||||
@@ -17,7 +17,6 @@ reporters_bin += reporter-ureport
|
||||
endif
|
||||
|
||||
bin_PROGRAMS = $(reporters_bin) \
|
||||
- reporter-rhtsupport \
|
||||
reporter-kerneloops \
|
||||
reporter-upload \
|
||||
reporter-mailx \
|
||||
@@ -56,7 +55,6 @@ endif
|
||||
|
||||
defaultreportpluginsconfdir = $(DEFAULT_REPORT_PLUGINS_CONF_DIR)
|
||||
dist_defaultreportpluginsconf_DATA = $(reporters_plugin_conf) \
|
||||
- rhtsupport.conf \
|
||||
mailx.conf \
|
||||
upload.conf \
|
||||
ureport.conf
|
||||
@@ -88,8 +86,6 @@ endif
|
||||
dist_events_DATA = $(reporters_events) \
|
||||
report_Logger.xml \
|
||||
report_Mailx.xml \
|
||||
- report_RHTSupport.xml \
|
||||
- report_RHTSupport_AddData.xml \
|
||||
report_Kerneloops.xml \
|
||||
report_Uploader.xml \
|
||||
report_EmergencyAnalysis.xml
|
||||
@@ -105,7 +101,6 @@ eventsdefdir = $(EVENTS_DEFINITION_DIR)
|
||||
dist_eventsdef_DATA = \
|
||||
mailx_event.conf \
|
||||
print_event.conf \
|
||||
- rhtsupport_event.conf \
|
||||
uploader_event.conf \
|
||||
emergencyanalysis_event.conf \
|
||||
centos_report_event.conf \
|
||||
@@ -129,8 +124,6 @@ EXTRA_DIST = $(reporters_extra_dist) \
|
||||
report_Logger.conf \
|
||||
report_Logger.xml.in \
|
||||
report_Mailx.xml.in \
|
||||
- report_RHTSupport.xml.in \
|
||||
- report_RHTSupport_AddData.xml.in \
|
||||
report_Kerneloops.xml.in \
|
||||
report_Uploader.xml.in \
|
||||
report_EmergencyAnalysis.xml.in
|
||||
@@ -185,32 +178,6 @@ reporter_mantisbt_LDADD = \
|
||||
../lib/libreport.la
|
||||
endif
|
||||
|
||||
-reporter_rhtsupport_SOURCES = \
|
||||
- abrt_rh_support.h abrt_rh_support.c \
|
||||
- reporter-rhtsupport.h \
|
||||
- reporter-rhtsupport-parse.c \
|
||||
- reporter-rhtsupport.c
|
||||
-reporter_rhtsupport_CPPFLAGS = \
|
||||
- -I$(srcdir)/../include \
|
||||
- -I$(srcdir)/../lib \
|
||||
- -DBIN_DIR=\"$(bindir)\" \
|
||||
- -DCONF_DIR=\"$(CONF_DIR)\" \
|
||||
- -DLOCALSTATEDIR='"$(localstatedir)"' \
|
||||
- -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
|
||||
- -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
|
||||
- -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
|
||||
- -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
|
||||
- -DLARGE_DATA_TMP_DIR=\"$(LARGE_DATA_TMP_DIR)\" \
|
||||
- $(GLIB_CFLAGS) \
|
||||
- $(LIBREPORT_CFLAGS) \
|
||||
- $(LIBXML_CFLAGS) \
|
||||
- -D_GNU_SOURCE
|
||||
-reporter_rhtsupport_LDADD = \
|
||||
- $(GLIB_LIBS) \
|
||||
- $(LIBXML_LIBS) \
|
||||
- ../lib/libreport-web.la \
|
||||
- ../lib/libreport.la
|
||||
-
|
||||
reporter_upload_SOURCES = \
|
||||
reporter-upload.c
|
||||
reporter_upload_CPPFLAGS = \
|
||||
|
||||
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
|
||||
index dbc7057..269727a 100644
|
||||
--- a/src/plugins/Makefile.in
|
||||
+++ b/src/plugins/Makefile.in
|
||||
@@ -97,7 +97,7 @@ host_triplet = @host@
|
||||
@BUILD_MANTISBT_TRUE@ reporter-mantisbt
|
||||
|
||||
@BUILD_UREPORT_TRUE@am__append_3 = reporter-ureport
|
||||
-bin_PROGRAMS = $(am__EXEEXT_4) reporter-rhtsupport$(EXEEXT) \
|
||||
+bin_PROGRAMS = $(am__EXEEXT_4) \
|
||||
reporter-kerneloops$(EXEEXT) reporter-upload$(EXEEXT) \
|
||||
reporter-mailx$(EXEEXT) reporter-print$(EXEEXT) \
|
||||
reporter-systemd-journal$(EXEEXT)
|
||||
@@ -201,14 +201,6 @@ reporter_mantisbt_OBJECTS = $(am_reporter_mantisbt_OBJECTS)
|
||||
am_reporter_print_OBJECTS = reporter_print-reporter-print.$(OBJEXT)
|
||||
reporter_print_OBJECTS = $(am_reporter_print_OBJECTS)
|
||||
reporter_print_DEPENDENCIES = ../lib/libreport.la
|
||||
-am_reporter_rhtsupport_OBJECTS = \
|
||||
- reporter_rhtsupport-abrt_rh_support.$(OBJEXT) \
|
||||
- reporter_rhtsupport-reporter-rhtsupport-parse.$(OBJEXT) \
|
||||
- reporter_rhtsupport-reporter-rhtsupport.$(OBJEXT)
|
||||
-reporter_rhtsupport_OBJECTS = $(am_reporter_rhtsupport_OBJECTS)
|
||||
-reporter_rhtsupport_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
||||
- $(am__DEPENDENCIES_1) ../lib/libreport-web.la \
|
||||
- ../lib/libreport.la
|
||||
am_reporter_systemd_journal_OBJECTS = \
|
||||
reporter_systemd_journal-reporter-systemd-journal.$(OBJEXT)
|
||||
reporter_systemd_journal_OBJECTS = \
|
||||
@@ -263,14 +255,13 @@ am__v_CCLD_1 =
|
||||
SOURCES = $(report_SOURCES) $(reporter_bugzilla_SOURCES) \
|
||||
$(reporter_kerneloops_SOURCES) $(reporter_mailx_SOURCES) \
|
||||
$(reporter_mantisbt_SOURCES) $(reporter_print_SOURCES) \
|
||||
- $(reporter_rhtsupport_SOURCES) \
|
||||
$(reporter_systemd_journal_SOURCES) $(reporter_upload_SOURCES) \
|
||||
$(reporter_ureport_SOURCES)
|
||||
DIST_SOURCES = $(am__report_SOURCES_DIST) \
|
||||
$(am__reporter_bugzilla_SOURCES_DIST) \
|
||||
$(reporter_kerneloops_SOURCES) $(reporter_mailx_SOURCES) \
|
||||
$(am__reporter_mantisbt_SOURCES_DIST) \
|
||||
- $(reporter_print_SOURCES) $(reporter_rhtsupport_SOURCES) \
|
||||
+ $(reporter_print_SOURCES) \
|
||||
$(reporter_systemd_journal_SOURCES) $(reporter_upload_SOURCES) \
|
||||
$(am__reporter_ureport_SOURCES_DIST)
|
||||
am__can_run_installinfo = \
|
||||
@@ -279,7 +270,7 @@ am__can_run_installinfo = \
|
||||
*) (install-info --version) >/dev/null 2>&1;; \
|
||||
esac
|
||||
am__dist_defaultreportpluginsconf_DATA_DIST = bugzilla.conf \
|
||||
- mantisbt.conf rhtsupport.conf mailx.conf upload.conf \
|
||||
+ mantisbt.conf mailx.conf upload.conf \
|
||||
ureport.conf
|
||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||
am__vpath_adj = case $$p in \
|
||||
@@ -310,17 +301,16 @@ am__uninstall_files_from_dir = { \
|
||||
}
|
||||
am__dist_events_DATA_DIST = report_Bugzilla.xml watch_Bugzilla.xml \
|
||||
report_CentOSBugTracker.xml report_uReport.xml \
|
||||
- report_Logger.xml report_Mailx.xml report_RHTSupport.xml \
|
||||
- report_RHTSupport_AddData.xml report_Kerneloops.xml \
|
||||
+ report_Logger.xml report_Mailx.xml \
|
||||
+ report_Kerneloops.xml \
|
||||
report_Uploader.xml report_EmergencyAnalysis.xml
|
||||
am__dist_eventsconf_DATA_DIST = report_Bugzilla.conf \
|
||||
report_CentOSBugTracker.conf report_Logger.conf \
|
||||
report_Uploader.conf
|
||||
am__dist_eventsdef_DATA_DIST = mailx_event.conf print_event.conf \
|
||||
- rhtsupport_event.conf uploader_event.conf \
|
||||
+ uploader_event.conf \
|
||||
emergencyanalysis_event.conf centos_report_event.conf \
|
||||
bugzilla_event.conf bugzilla_anaconda_event.conf
|
||||
-am__dist_libreportconf_DATA_DIST = cert-api.access.redhat.com.pem
|
||||
am__dist_reportpluginsconf_DATA_DIST = bugzilla_format.conf \
|
||||
bugzilla_formatdup.conf \
|
||||
bugzilla_format_analyzer_libreport.conf \
|
||||
@@ -329,7 +319,7 @@ am__dist_reportpluginsconf_DATA_DIST = bugzilla_format.conf \
|
||||
mantisbt_formatdup.conf \
|
||||
mantisbt_format_analyzer_libreport.conf \
|
||||
mantisbt_formatdup_analyzer_libreport.conf bugzilla.conf \
|
||||
- mantisbt.conf rhtsupport.conf mailx.conf upload.conf \
|
||||
+ mantisbt.conf mailx.conf upload.conf \
|
||||
ureport.conf
|
||||
DATA = $(dist_defaultreportpluginsconf_DATA) $(dist_events_DATA) \
|
||||
$(dist_eventsconf_DATA) $(dist_eventsdef_DATA) \
|
||||
@@ -581,15 +571,11 @@ pluginslibdir = $(PLUGINS_LIB_DIR)
|
||||
reporters_bin = $(am__append_1) $(am__append_2) $(am__append_3)
|
||||
pluginsconfdir = $(PLUGINS_CONF_DIR)
|
||||
reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR)
|
||||
-@ENABLE_IMPORT_RHTSUPPORT_CERT_TRUE@libreportconfdir = $(CONF_DIR)
|
||||
-@ENABLE_IMPORT_RHTSUPPORT_CERT_TRUE@dist_libreportconf_DATA = \
|
||||
-@ENABLE_IMPORT_RHTSUPPORT_CERT_TRUE@ cert-api.access.redhat.com.pem
|
||||
|
||||
reporters_plugin_conf = $(am__append_4) $(am__append_6)
|
||||
reporters_plugin_format_conf = $(am__append_5) $(am__append_7)
|
||||
defaultreportpluginsconfdir = $(DEFAULT_REPORT_PLUGINS_CONF_DIR)
|
||||
dist_defaultreportpluginsconf_DATA = $(reporters_plugin_conf) \
|
||||
- rhtsupport.conf \
|
||||
mailx.conf \
|
||||
upload.conf \
|
||||
ureport.conf
|
||||
@@ -604,8 +590,6 @@ reporters_events_conf = $(am__append_9) $(am__append_11)
|
||||
dist_events_DATA = $(reporters_events) \
|
||||
report_Logger.xml \
|
||||
report_Mailx.xml \
|
||||
- report_RHTSupport.xml \
|
||||
- report_RHTSupport_AddData.xml \
|
||||
report_Kerneloops.xml \
|
||||
report_Uploader.xml \
|
||||
report_EmergencyAnalysis.xml
|
||||
@@ -616,7 +600,7 @@ dist_eventsconf_DATA = $(reporters_events_conf) \
|
||||
|
||||
eventsdefdir = $(EVENTS_DEFINITION_DIR)
|
||||
dist_eventsdef_DATA = mailx_event.conf print_event.conf \
|
||||
- rhtsupport_event.conf uploader_event.conf \
|
||||
+ uploader_event.conf \
|
||||
emergencyanalysis_event.conf centos_report_event.conf \
|
||||
$(am__append_13)
|
||||
reporters_extra_dist = $(am__append_14) $(am__append_15) \
|
||||
@@ -625,8 +609,6 @@ EXTRA_DIST = $(reporters_extra_dist) \
|
||||
report_Logger.conf \
|
||||
report_Logger.xml.in \
|
||||
report_Mailx.xml.in \
|
||||
- report_RHTSupport.xml.in \
|
||||
- report_RHTSupport_AddData.xml.in \
|
||||
report_Kerneloops.xml.in \
|
||||
report_Uploader.xml.in \
|
||||
report_EmergencyAnalysis.xml.in
|
||||
@@ -678,34 +660,6 @@ EXTRA_DIST = $(reporters_extra_dist) \
|
||||
@BUILD_MANTISBT_TRUE@ ../lib/libreport-web.la \
|
||||
@BUILD_MANTISBT_TRUE@ ../lib/libreport.la
|
||||
|
||||
-reporter_rhtsupport_SOURCES = \
|
||||
- abrt_rh_support.h abrt_rh_support.c \
|
||||
- reporter-rhtsupport.h \
|
||||
- reporter-rhtsupport-parse.c \
|
||||
- reporter-rhtsupport.c
|
||||
-
|
||||
-reporter_rhtsupport_CPPFLAGS = \
|
||||
- -I$(srcdir)/../include \
|
||||
- -I$(srcdir)/../lib \
|
||||
- -DBIN_DIR=\"$(bindir)\" \
|
||||
- -DCONF_DIR=\"$(CONF_DIR)\" \
|
||||
- -DLOCALSTATEDIR='"$(localstatedir)"' \
|
||||
- -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
|
||||
- -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
|
||||
- -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
|
||||
- -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
|
||||
- -DLARGE_DATA_TMP_DIR=\"$(LARGE_DATA_TMP_DIR)\" \
|
||||
- $(GLIB_CFLAGS) \
|
||||
- $(LIBREPORT_CFLAGS) \
|
||||
- $(LIBXML_CFLAGS) \
|
||||
- -D_GNU_SOURCE
|
||||
-
|
||||
-reporter_rhtsupport_LDADD = \
|
||||
- $(GLIB_LIBS) \
|
||||
- $(LIBXML_LIBS) \
|
||||
- ../lib/libreport-web.la \
|
||||
- ../lib/libreport.la
|
||||
-
|
||||
reporter_upload_SOURCES = \
|
||||
reporter-upload.c
|
||||
|
||||
@@ -956,10 +910,6 @@ reporter-print$(EXEEXT): $(reporter_print_OBJECTS) $(reporter_print_DEPENDENCIES
|
||||
@rm -f reporter-print$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(reporter_print_OBJECTS) $(reporter_print_LDADD) $(LIBS)
|
||||
|
||||
-reporter-rhtsupport$(EXEEXT): $(reporter_rhtsupport_OBJECTS) $(reporter_rhtsupport_DEPENDENCIES) $(EXTRA_reporter_rhtsupport_DEPENDENCIES)
|
||||
- @rm -f reporter-rhtsupport$(EXEEXT)
|
||||
- $(AM_V_CCLD)$(LINK) $(reporter_rhtsupport_OBJECTS) $(reporter_rhtsupport_LDADD) $(LIBS)
|
||||
-
|
||||
reporter-systemd-journal$(EXEEXT): $(reporter_systemd_journal_OBJECTS) $(reporter_systemd_journal_DEPENDENCIES) $(EXTRA_reporter_systemd_journal_DEPENDENCIES)
|
||||
@rm -f reporter-systemd-journal$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(reporter_systemd_journal_OBJECTS) $(reporter_systemd_journal_LDADD) $(LIBS)
|
||||
@@ -986,9 +936,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_mantisbt-mantisbt.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_mantisbt-reporter-mantisbt.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_print-reporter-print.Po@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_rhtsupport-abrt_rh_support.Po@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport-parse.Po@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_systemd_journal-reporter-systemd-journal.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_upload-reporter-upload.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_ureport-reporter-ureport.Po@am__quote@
|
||||
@@ -1125,49 +1072,6 @@ reporter_print-reporter-print.obj: reporter-print.c
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reporter-print.c' object='reporter_print-reporter-print.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_print_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reporter_print-reporter-print.obj `if test -f 'reporter-print.c'; then $(CYGPATH_W) 'reporter-print.c'; else $(CYGPATH_W) '$(srcdir)/reporter-print.c'; fi`
|
||||
-
|
||||
-reporter_rhtsupport-abrt_rh_support.o: abrt_rh_support.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reporter_rhtsupport-abrt_rh_support.o -MD -MP -MF $(DEPDIR)/reporter_rhtsupport-abrt_rh_support.Tpo -c -o reporter_rhtsupport-abrt_rh_support.o `test -f 'abrt_rh_support.c' || echo '$(srcdir)/'`abrt_rh_support.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reporter_rhtsupport-abrt_rh_support.Tpo $(DEPDIR)/reporter_rhtsupport-abrt_rh_support.Po
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='abrt_rh_support.c' object='reporter_rhtsupport-abrt_rh_support.o' libtool=no @AMDEPBACKSLASH@
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reporter_rhtsupport-abrt_rh_support.o `test -f 'abrt_rh_support.c' || echo '$(srcdir)/'`abrt_rh_support.c
|
||||
-
|
||||
-reporter_rhtsupport-abrt_rh_support.obj: abrt_rh_support.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reporter_rhtsupport-abrt_rh_support.obj -MD -MP -MF $(DEPDIR)/reporter_rhtsupport-abrt_rh_support.Tpo -c -o reporter_rhtsupport-abrt_rh_support.obj `if test -f 'abrt_rh_support.c'; then $(CYGPATH_W) 'abrt_rh_support.c'; else $(CYGPATH_W) '$(srcdir)/abrt_rh_support.c'; fi`
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reporter_rhtsupport-abrt_rh_support.Tpo $(DEPDIR)/reporter_rhtsupport-abrt_rh_support.Po
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='abrt_rh_support.c' object='reporter_rhtsupport-abrt_rh_support.obj' libtool=no @AMDEPBACKSLASH@
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reporter_rhtsupport-abrt_rh_support.obj `if test -f 'abrt_rh_support.c'; then $(CYGPATH_W) 'abrt_rh_support.c'; else $(CYGPATH_W) '$(srcdir)/abrt_rh_support.c'; fi`
|
||||
-
|
||||
-reporter_rhtsupport-reporter-rhtsupport-parse.o: reporter-rhtsupport-parse.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reporter_rhtsupport-reporter-rhtsupport-parse.o -MD -MP -MF $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport-parse.Tpo -c -o reporter_rhtsupport-reporter-rhtsupport-parse.o `test -f 'reporter-rhtsupport-parse.c' || echo '$(srcdir)/'`reporter-rhtsupport-parse.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport-parse.Tpo $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport-parse.Po
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reporter-rhtsupport-parse.c' object='reporter_rhtsupport-reporter-rhtsupport-parse.o' libtool=no @AMDEPBACKSLASH@
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reporter_rhtsupport-reporter-rhtsupport-parse.o `test -f 'reporter-rhtsupport-parse.c' || echo '$(srcdir)/'`reporter-rhtsupport-parse.c
|
||||
-
|
||||
-reporter_rhtsupport-reporter-rhtsupport-parse.obj: reporter-rhtsupport-parse.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reporter_rhtsupport-reporter-rhtsupport-parse.obj -MD -MP -MF $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport-parse.Tpo -c -o reporter_rhtsupport-reporter-rhtsupport-parse.obj `if test -f 'reporter-rhtsupport-parse.c'; then $(CYGPATH_W) 'reporter-rhtsupport-parse.c'; else $(CYGPATH_W) '$(srcdir)/reporter-rhtsupport-parse.c'; fi`
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport-parse.Tpo $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport-parse.Po
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reporter-rhtsupport-parse.c' object='reporter_rhtsupport-reporter-rhtsupport-parse.obj' libtool=no @AMDEPBACKSLASH@
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reporter_rhtsupport-reporter-rhtsupport-parse.obj `if test -f 'reporter-rhtsupport-parse.c'; then $(CYGPATH_W) 'reporter-rhtsupport-parse.c'; else $(CYGPATH_W) '$(srcdir)/reporter-rhtsupport-parse.c'; fi`
|
||||
-
|
||||
-reporter_rhtsupport-reporter-rhtsupport.o: reporter-rhtsupport.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reporter_rhtsupport-reporter-rhtsupport.o -MD -MP -MF $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport.Tpo -c -o reporter_rhtsupport-reporter-rhtsupport.o `test -f 'reporter-rhtsupport.c' || echo '$(srcdir)/'`reporter-rhtsupport.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport.Tpo $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport.Po
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reporter-rhtsupport.c' object='reporter_rhtsupport-reporter-rhtsupport.o' libtool=no @AMDEPBACKSLASH@
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reporter_rhtsupport-reporter-rhtsupport.o `test -f 'reporter-rhtsupport.c' || echo '$(srcdir)/'`reporter-rhtsupport.c
|
||||
-
|
||||
-reporter_rhtsupport-reporter-rhtsupport.obj: reporter-rhtsupport.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reporter_rhtsupport-reporter-rhtsupport.obj -MD -MP -MF $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport.Tpo -c -o reporter_rhtsupport-reporter-rhtsupport.obj `if test -f 'reporter-rhtsupport.c'; then $(CYGPATH_W) 'reporter-rhtsupport.c'; else $(CYGPATH_W) '$(srcdir)/reporter-rhtsupport.c'; fi`
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport.Tpo $(DEPDIR)/reporter_rhtsupport-reporter-rhtsupport.Po
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reporter-rhtsupport.c' object='reporter_rhtsupport-reporter-rhtsupport.obj' libtool=no @AMDEPBACKSLASH@
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_rhtsupport_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reporter_rhtsupport-reporter-rhtsupport.obj `if test -f 'reporter-rhtsupport.c'; then $(CYGPATH_W) 'reporter-rhtsupport.c'; else $(CYGPATH_W) '$(srcdir)/reporter-rhtsupport.c'; fi`
|
||||
-
|
||||
reporter_systemd_journal-reporter-systemd-journal.o: reporter-systemd-journal.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_systemd_journal_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reporter_systemd_journal-reporter-systemd-journal.o -MD -MP -MF $(DEPDIR)/reporter_systemd_journal-reporter-systemd-journal.Tpo -c -o reporter_systemd_journal-reporter-systemd-journal.o `test -f 'reporter-systemd-journal.c' || echo '$(srcdir)/'`reporter-systemd-journal.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reporter_systemd_journal-reporter-systemd-journal.Tpo $(DEPDIR)/reporter_systemd_journal-reporter-systemd-journal.Po
|
||||
diff --git a/src/plugins/report_RHTSupport.xml b/src/plugins/report_RHTSupport.xml
|
||||
index 112c626..6162399 100644
|
||||
--- a/src/plugins/report_RHTSupport.xml
|
||||
+++ b/src/plugins/report_RHTSupport.xml
|
||||
@@ -272,21 +272,21 @@
|
||||
<label xml:lang="uk">Надіслати uReport</label>
|
||||
<label xml:lang="zh_CN">提交 uReport</label>
|
||||
<label xml:lang="zh_TW">提交 uReport</label>
|
||||
- <note-html>Submit <a href="https://access.redhat.com/articles/642323">micro-report</a> when creating a new case.</note-html>
|
||||
- <note-html xml:lang="ca">Publica el <a href="https://access.redhat.com/articles/642323">micro-informe</a> quan es creï un nou cas.</note-html>
|
||||
- <note-html xml:lang="cs">Při vytváření nového případu odeslat <a href="https://access.redhat.com/articles/642323">mikro-report</a></note-html>
|
||||
- <note-html xml:lang="de"><a href="https://access.redhat.com/articles/642323">Micro-Bericht</a> übertragen, wenn neuer Fehlerbericht erstellt wird.</note-html>
|
||||
- <note-html xml:lang="es">Enviar <a href="https://access.redhat.com/articles/642323">uReport</a> al crear un nuevo caso.</note-html>
|
||||
- <note-html xml:lang="fr">Soummetre <a href="https://access.redhat.com/articles/642323">micro-report</a> lors de la création d'un nouveau dossier.</note-html>
|
||||
- <note-html xml:lang="it">Invia <a href="https://access.redhat.com/articles/642323">micro-report</a> quando crei un nuovo caso.</note-html>
|
||||
- <note-html xml:lang="nl">Dien <a href="https://access.redhat.com/articles/642323">micro-report</a> in als een nieuwe bug aangemaakt wordt.</note-html>
|
||||
- <note-html xml:lang="pl">Wyślij <a href="https://access.redhat.com/articles/642323">mikroraport</a> podczas tworzenia nowego przypadku.</note-html>
|
||||
- <note-html xml:lang="pt_BR">Enviar <a href="https://access.redhat.com/articles/642323">micro-report</a> quando criar um novo caso. </note-html>
|
||||
- <note-html xml:lang="ru">Отправлять <a href="https://access.redhat.com/articles/642323">микроотчет</a> при создании нового запроса.</note-html>
|
||||
- <note-html xml:lang="sv">Skicka en <a href="https://access.redhat.com/articles/642323">mikrorapport</a> när ett nytt ärende skapas.</note-html>
|
||||
- <note-html xml:lang="uk">Надіслати <a href="https://access.redhat.com/articles/642323">мікрозвіт</a> під час створення нового запису випадку.</note-html>
|
||||
- <note-html xml:lang="zh_CN">生成新问题单时才提交 <a href="https://access.redhat.com/articles/642323">micro-report</a>。</note-html>
|
||||
- <note-html xml:lang="zh_TW">當建立新案例時提交 <a href="https://access.redhat.com/articles/642323">micro-report</a>。</note-html>
|
||||
+ <note-html>Submit <a href="https://almalinux.org">micro-report</a> when creating a new case.</note-html>
|
||||
+ <note-html xml:lang="ca">Publica el <a href="https://almalinux.org">micro-informe</a> quan es creï un nou cas.</note-html>
|
||||
+ <note-html xml:lang="cs">Při vytváření nového případu odeslat <a href="https://almalinux.org">mikro-report</a></note-html>
|
||||
+ <note-html xml:lang="de"><a href="https://almalinux.org">Micro-Bericht</a> übertragen, wenn neuer Fehlerbericht erstellt wird.</note-html>
|
||||
+ <note-html xml:lang="es">Enviar <a href="https://almalinux.org">uReport</a> al crear un nuevo caso.</note-html>
|
||||
+ <note-html xml:lang="fr">Soummetre <a href="https://almalinux.org">micro-report</a> lors de la création d'un nouveau dossier.</note-html>
|
||||
+ <note-html xml:lang="it">Invia <a href="https://almalinux.org">micro-report</a> quando crei un nuovo caso.</note-html>
|
||||
+ <note-html xml:lang="nl">Dien <a href="https://almalinux.org">micro-report</a> in als een nieuwe bug aangemaakt wordt.</note-html>
|
||||
+ <note-html xml:lang="pl">Wyślij <a href="https://almalinux.org">mikroraport</a> podczas tworzenia nowego przypadku.</note-html>
|
||||
+ <note-html xml:lang="pt_BR">Enviar <a href="https://almalinux.org">micro-report</a> quando criar um novo caso. </note-html>
|
||||
+ <note-html xml:lang="ru">Отправлять <a href="https://almalinux.org">микроотчет</a> при создании нового запроса.</note-html>
|
||||
+ <note-html xml:lang="sv">Skicka en <a href="https://almalinux.org">mikrorapport</a> när ett nytt ärende skapas.</note-html>
|
||||
+ <note-html xml:lang="uk">Надіслати <a href="https://almalinux.org">мікрозвіт</a> під час створення нового запису випадку.</note-html>
|
||||
+ <note-html xml:lang="zh_CN">生成新问题单时才提交 <a href="https://almalinux.org">micro-report</a>。</note-html>
|
||||
+ <note-html xml:lang="zh_TW">當建立新案例時提交 <a href="https://almalinux.org">micro-report</a>。</note-html>
|
||||
<default-value>yes</default-value>
|
||||
</option>
|
||||
<option type="text" name="RHTSupport_URL">
|
||||
@@ -570,4 +570,4 @@
|
||||
</option>
|
||||
</advanced-options>
|
||||
</options>
|
||||
-</event>
|
||||
\ No newline at end of file
|
||||
+</event>
|
||||
@ -25,8 +25,6 @@ Patch2: 0002-rhbz-Be-a-little-bit-more-defensive-when-working-wit.patch
|
||||
Patch3: 0003-rhbz-Retry-XML-RPC-calls-when-uploading-attachments.patch
|
||||
# AlmaLinux: add almalinux plugin
|
||||
Patch9100: 9100-Add-almalinux-plugin.patch
|
||||
# AlmaLinux: remove rhtsupport (patch from Oracle)
|
||||
Patch9101: 9101-Remove-rhtsupport.patch
|
||||
|
||||
BuildRequires: %{dbus_devel}
|
||||
BuildRequires: gtk3-devel
|
||||
|
||||
Loading…
Reference in New Issue
Block a user