rpms/libreport
7
0
Fork 0
Code Issues Pull Requests Releases Activity

AlmaLinux changes

Browse Source
This commit is contained in:
Andrew Lukoshko 2021-09-15 10:16:01 +00:00
parent 39000aebd8
commit da64855b50
3 changed files with 2154 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1719
SOURCES/9100-Add-almalinux-plugin.patch Normal file
View File

File diff suppressed because it is too large Load Diff

370
SOURCES/9101-Remove-rhtsupport.patch Normal file
View File

@ -0,0 +1,370 @@
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 &lt;a href="https://access.redhat.com/articles/642323"&gt;micro-report&lt;/a&gt; when creating a new case.</note-html>
- <note-html xml:lang="ca">Publica el &lt;a href="https://access.redhat.com/articles/642323"&gt;micro-informe&lt;/a&gt; quan es creï un nou cas.</note-html>
- <note-html xml:lang="cs">Při vytváření nového případu odeslat &lt;a href="https://access.redhat.com/articles/642323"&gt;mikro-report&lt;/a&gt;</note-html>
- <note-html xml:lang="de">&lt;a href="https://access.redhat.com/articles/642323"&gt;Micro-Bericht&lt;/a&gt; übertragen, wenn neuer Fehlerbericht erstellt wird.</note-html>
- <note-html xml:lang="es">Enviar &lt;a href="https://access.redhat.com/articles/642323"&gt;uReport&lt;/a&gt; al crear un nuevo caso.</note-html>
- <note-html xml:lang="fr">Soummetre &lt;a href="https://access.redhat.com/articles/642323"&gt;micro-report&lt;/a&gt; lors de la création d'un nouveau dossier.</note-html>
- <note-html xml:lang="it">Invia &lt;a href="https://access.redhat.com/articles/642323"&gt;micro-report&lt;/a&gt; quando crei un nuovo caso.</note-html>
- <note-html xml:lang="nl">Dien &lt;a href="https://access.redhat.com/articles/642323"&gt;micro-report&lt;/a&gt; in als een nieuwe bug aangemaakt wordt.</note-html>
- <note-html xml:lang="pl">Wyślij &lt;a href="https://access.redhat.com/articles/642323"&gt;mikroraport&lt;/a&gt; podczas tworzenia nowego przypadku.</note-html>
- <note-html xml:lang="pt_BR">Enviar &lt;a href="https://access.redhat.com/articles/642323"&gt;micro-report&lt;/a&gt; quando criar um novo caso. </note-html>
- <note-html xml:lang="ru">Отправлять &lt;a href="https://access.redhat.com/articles/642323"&gt;микроотчет&lt;/a&gt; при создании нового запроса.</note-html>
- <note-html xml:lang="sv">Skicka en &lt;a href="https://access.redhat.com/articles/642323"&gt;mikrorapport&lt;/a&gt; när ett nytt ärende skapas.</note-html>
- <note-html xml:lang="uk">Надіслати &lt;a href="https://access.redhat.com/articles/642323"&gt;мікрозвіт&lt;/a&gt; під час створення нового запису випадку.</note-html>
- <note-html xml:lang="zh_CN">生成新问题单时才提交 &lt;a href="https://access.redhat.com/articles/642323"&gt;micro-report&lt;/a&gt;。</note-html>
- <note-html xml:lang="zh_TW">當建立新案例時提交 &lt;a href="https://access.redhat.com/articles/642323"&gt;micro-report&lt;/a&gt;。</note-html>
+ <note-html>Submit &lt;a href="https://almalinux.org"&gt;micro-report&lt;/a&gt; when creating a new case.</note-html>
+ <note-html xml:lang="ca">Publica el &lt;a href="https://almalinux.org"&gt;micro-informe&lt;/a&gt; quan es creï un nou cas.</note-html>
+ <note-html xml:lang="cs">Při vytváření nového případu odeslat &lt;a href="https://almalinux.org"&gt;mikro-report&lt;/a&gt;</note-html>
+ <note-html xml:lang="de">&lt;a href="https://almalinux.org"&gt;Micro-Bericht&lt;/a&gt; übertragen, wenn neuer Fehlerbericht erstellt wird.</note-html>
+ <note-html xml:lang="es">Enviar &lt;a href="https://almalinux.org"&gt;uReport&lt;/a&gt; al crear un nuevo caso.</note-html>
+ <note-html xml:lang="fr">Soummetre &lt;a href="https://almalinux.org"&gt;micro-report&lt;/a&gt; lors de la création d'un nouveau dossier.</note-html>
+ <note-html xml:lang="it">Invia &lt;a href="https://almalinux.org"&gt;micro-report&lt;/a&gt; quando crei un nuovo caso.</note-html>
+ <note-html xml:lang="nl">Dien &lt;a href="https://almalinux.org"&gt;micro-report&lt;/a&gt; in als een nieuwe bug aangemaakt wordt.</note-html>
+ <note-html xml:lang="pl">Wyślij &lt;a href="https://almalinux.org"&gt;mikroraport&lt;/a&gt; podczas tworzenia nowego przypadku.</note-html>
+ <note-html xml:lang="pt_BR">Enviar &lt;a href="https://almalinux.org"&gt;micro-report&lt;/a&gt; quando criar um novo caso. </note-html>
+ <note-html xml:lang="ru">Отправлять &lt;a href="https://almalinux.org"&gt;микроотчет&lt;/a&gt; при создании нового запроса.</note-html>
+ <note-html xml:lang="sv">Skicka en &lt;a href="https://almalinux.org"&gt;mikrorapport&lt;/a&gt; när ett nytt ärende skapas.</note-html>
+ <note-html xml:lang="uk">Надіслати &lt;a href="https://almalinux.org"&gt;мікрозвіт&lt;/a&gt; під час створення нового запису випадку.</note-html>
+ <note-html xml:lang="zh_CN">生成新问题单时才提交 &lt;a href="https://almalinux.org"&gt;micro-report&lt;/a&gt;。</note-html>
+ <note-html xml:lang="zh_TW">當建立新案例時提交 &lt;a href="https://almalinux.org"&gt;micro-report&lt;/a&gt;。</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>

158
SPECS/libreport.spec
View File

@ -1,3 +1,4 @@
%global dist %{?dist}.alma.1
%if 0%{?suse_version} %if 0%{?suse_version}
%bcond_with bugzilla %bcond_with bugzilla
@ -77,6 +78,11 @@ Patch0032: 0032-Drop-remaining-references-to-removed-command-line-op.patch
# autogen.sh is need to regenerate all the Makefile files # autogen.sh is need to regenerate all the Makefile files
Patch9000: 9000-Add-autogen.sh.patch Patch9000: 9000-Add-autogen.sh.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: %{dbus_devel}
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
BuildRequires: curl-devel BuildRequires: curl-devel
@ -283,14 +289,14 @@ Requires: libreport-web = %{version}-%{release}
%description plugin-mantisbt %description plugin-mantisbt
Plugin to report bugs into the mantisbt. Plugin to report bugs into the mantisbt.
%package centos %package almalinux
Summary: %{name}'s CentOS Bug Tracker workflow Summary: %{name}'s AlmaLinux Bug Tracker workflow
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: libreport-web = %{version}-%{release} Requires: libreport-web = %{version}-%{release}
Requires: libreport-plugin-mantisbt = %{version}-%{release} Requires: libreport-plugin-mantisbt = %{version}-%{release}
%description centos %description almalinux
Workflows to report issues into the CentOS Bug Tracker. Workflows to report issues into the AlmaLinux Bug Tracker.
%package plugin-ureport %package plugin-ureport
Summary: %{name}'s micro report plugin Summary: %{name}'s micro report plugin
@ -299,30 +305,21 @@ Requires: %{name} = %{version}-%{release}
Requires: libreport-web = %{version}-%{release} Requires: libreport-web = %{version}-%{release}
%if 0%{?rhel} %if 0%{?rhel}
%if %{with python2} %if %{with python2}
Requires: python-rhsm # Requires: python-rhsm
%endif # with python2 %endif # with python2
%if %{with python3} %if %{with python3}
Requires: python3-subscription-manager-rhsm # Requires: python3-subscription-manager-rhsm
%endif # with python3 %endif # with python3
%endif %endif
%description plugin-ureport %description plugin-ureport
Uploads micro-report to abrt server Uploads micro-report to abrt server
%package plugin-rhtsupport
Summary: %{name}'s RHTSupport plugin
Requires: %{name} = %{version}-%{release}
Requires: libreport-web = %{version}-%{release}
%description plugin-rhtsupport
Plugin to report bugs into RH support system.
%if %{with bugzilla} %if %{with bugzilla}
%package compat %package compat
Summary: %{name}'s compat layer for obsoleted 'report' package Summary: %{name}'s compat layer for obsoleted 'report' package
Requires: libreport = %{version}-%{release} Requires: libreport = %{version}-%{release}
Requires: %{name}-plugin-bugzilla = %{version}-%{release} Requires: %{name}-plugin-bugzilla = %{version}-%{release}
Requires: %{name}-plugin-rhtsupport = %{version}-%{release}
%description compat %description compat
Provides 'report' command-line tool. Provides 'report' command-line tool.
@ -385,9 +382,9 @@ Summary: Default configuration for reporting anaconda bugs
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: libreport-plugin-reportuploader = %{version}-%{release} Requires: libreport-plugin-reportuploader = %{version}-%{release}
%if 0%{?rhel} %if 0%{?rhel}
Requires: libreport-plugin-rhtsupport = %{version}-%{release} # Requires: libreport-plugin-rhtsupport = %{version}-%{release}
%else %else
Requires: libreport-plugin-bugzilla = %{version}-%{release} # Requires: libreport-plugin-bugzilla = %{version}-%{release}
%endif %endif
%description anaconda %description anaconda
@ -403,6 +400,10 @@ data over ftp/scp...
%define __scm_apply_git(qp:m:) %{__git} am %define __scm_apply_git(qp:m:) %{__git} am
%autosetup -S git %autosetup -S git
# AlmaLinux: reuse existing centos plugin translations for almalinux plugin
sed -e 's/CentOS/AlmaLinux/g' -i po/*.po
sed -e 's/centos/almalinux/g' -i po/*.po
%build %build
./autogen.sh ./autogen.sh
autoconf autoconf
@ -464,7 +465,6 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaFedora.xml
%endif %endif
# Remove unwanted RHEL specific workflow configuration files # Remove unwanted RHEL specific workflow configuration files
%if 0%{!?rhel:1}
rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELCCpp.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELCCpp.xml
rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELKerneloops.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELKerneloops.xml
rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELPython.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELPython.xml
@ -496,11 +496,33 @@ rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel.conf
rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf
rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_uReport.conf rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_uReport.conf
rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf
rm -f %{buildroot}%{_mandir}/man1/reporter-rhtsupport.1
rm -f %{buildroot}%{_mandir}/man5/rhtsupport.conf.5
rm -f %{buildroot}%{_mandir}/man5/rhtsupport_event.conf.5
rm -f %{buildroot}%{_mandir}/man5/report_rhel.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_rhel.conf.5
rm -f %{buildroot}%{_mandir}/man5/report_uReport.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_uReport.conf.5
rm -f %{buildroot}%{_mandir}/man5/report_rhel_bugzilla.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_rhel_bugzilla.conf.5
%endif rm -f %{buildroot}/%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.rhtsupport.xml
# Remove unwanted CentOS specific workflow configuration files
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSCCpp.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSKerneloops.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSPython.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSPython3.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSVmcore.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSXorg.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSLibreport.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSJava.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSJavaScript.xml
rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_centos.conf
rm -f %{buildroot}/%{_mandir}/man5/report_centos.conf.5
rm -f %{buildroot}/%{_datadir}/%{name}/events/report_CentOSBugTracker.xml
rm -f %{buildroot}/%{_sysconfdir}/libreport/events/report_CentOSBugTracker.conf
rm -f %{buildroot}/%{_mandir}/man5/report_CentOSBugTracker.conf.5
rm -f %{buildroot}/%{_sysconfdir}/libreport/events.d/centos_report_event.conf
rm -f %{buildroot}/%{_mandir}/man5/centos_report_event.conf.5
%ifnarch aarch64
%check %check
make check|| { make check|| {
# find and print the logs of failed test # find and print the logs of failed test
@ -508,6 +530,7 @@ make check|| {
find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \; find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \;
exit 1 exit 1
} }
%endif
%if 0%{?fedora} > 27 || 0%{?rhel} > 7 %if 0%{?fedora} > 27 || 0%{?rhel} > 7
# ldconfig and gtk-update-icon-cache is not needed # ldconfig and gtk-update-icon-cache is not needed
@ -724,36 +747,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man5/mantisbt_format_analyzer_libreport.conf.5.* %{_mandir}/man5/mantisbt_format_analyzer_libreport.conf.5.*
%{_mandir}/man5/mantisbt_formatdup_analyzer_libreport.conf.5.* %{_mandir}/man5/mantisbt_formatdup_analyzer_libreport.conf.5.*
%files centos %files almalinux
%{_datadir}/%{name}/workflows/workflow_CentOSCCpp.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxCCpp.xml
%{_datadir}/%{name}/workflows/workflow_CentOSKerneloops.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxKerneloops.xml
%{_datadir}/%{name}/workflows/workflow_CentOSPython.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxPython.xml
%{_datadir}/%{name}/workflows/workflow_CentOSPython3.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxPython3.xml
%{_datadir}/%{name}/workflows/workflow_CentOSVmcore.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxVmcore.xml
%{_datadir}/%{name}/workflows/workflow_CentOSXorg.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxXorg.xml
%{_datadir}/%{name}/workflows/workflow_CentOSLibreport.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxLibreport.xml
%{_datadir}/%{name}/workflows/workflow_CentOSJava.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxJava.xml
%{_datadir}/%{name}/workflows/workflow_CentOSJavaScript.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxJavaScript.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_centos.conf %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_almalinux.conf
%{_mandir}/man5/report_centos.conf.5.* %{_mandir}/man5/report_almalinux.conf.5.*
%{_datadir}/%{name}/events/report_CentOSBugTracker.xml %{_datadir}/%{name}/events/report_AlmaLinuxBugTracker.xml
%config(noreplace) %{_sysconfdir}/libreport/events/report_CentOSBugTracker.conf %config(noreplace) %{_sysconfdir}/libreport/events/report_AlmaLinuxBugTracker.conf
%{_mandir}/man5/report_CentOSBugTracker.conf.5.* %{_mandir}/man5/report_AlmaLinuxBugTracker.conf.5.*
# report_CentOSBugTracker events are shipped by libreport package # report_AlmaLinuxBugTracker events are shipped by libreport package
%config(noreplace) %{_sysconfdir}/libreport/events.d/centos_report_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/almalinux_report_event.conf
%{_mandir}/man5/centos_report_event.conf.5.gz %{_mandir}/man5/almalinux_report_event.conf.5.gz
%files plugin-rhtsupport
%config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf
%{_datadir}/%{name}/conf.d/plugins/rhtsupport.conf
%{_datadir}/%{name}/events/report_RHTSupport.xml
%{_datadir}/%{name}/events/report_RHTSupport_AddData.xml
%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.rhtsupport.xml
%config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf
%{_mandir}/man1/reporter-rhtsupport.1.gz
%{_mandir}/man5/rhtsupport.conf.5.*
%{_mandir}/man5/rhtsupport_event.conf.5.*
%{_bindir}/reporter-rhtsupport
%if %{with bugzilla} %if %{with bugzilla}
%files compat %files compat
@ -792,55 +803,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man5/report_fedora.conf.5.* %{_mandir}/man5/report_fedora.conf.5.*
%endif %endif
%if 0%{?rhel}
%files rhel
%{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml
%{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml
%{_datadir}/%{name}/workflows/workflow_RHELPython.xml
%{_datadir}/%{name}/workflows/workflow_RHELvmcore.xml
%{_datadir}/%{name}/workflows/workflow_RHELxorg.xml
%{_datadir}/%{name}/workflows/workflow_RHELLibreport.xml
%{_datadir}/%{name}/workflows/workflow_RHELJava.xml
%{_datadir}/%{name}/workflows/workflow_RHELJavaScript.xml
%{_datadir}/%{name}/workflows/workflow_RHELAddDataCCpp.xml
%{_datadir}/%{name}/workflows/workflow_RHELAddDataJava.xml
%{_datadir}/%{name}/workflows/workflow_RHELAddDataKerneloops.xml
%{_datadir}/%{name}/workflows/workflow_RHELAddDataLibreport.xml
%{_datadir}/%{name}/workflows/workflow_RHELAddDataPython.xml
%{_datadir}/%{name}/workflows/workflow_RHELAddDatavmcore.xml
%{_datadir}/%{name}/workflows/workflow_RHELAddDataxorg.xml
%{_datadir}/%{name}/workflows/workflow_RHELAddDataJavaScript.xml
%{_datadir}/%{name}/workflows/workflow_uReport.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_uReport.conf
%{_mandir}/man5/report_rhel.conf.5.*
%{_mandir}/man5/report_uReport.conf.5.*
%files rhel-bugzilla
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaCCpp.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaKerneloops.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaPython.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaVmcore.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaXorg.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaLibreport.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaJava.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaJavaScript.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf
%{_mandir}/man5/report_rhel_bugzilla.conf.5.*
%files rhel-anaconda-bugzilla
%{_datadir}/%{name}/workflows/workflow_AnacondaRHELBugzilla.xml
%endif
%if %{with bugzilla} %if %{with bugzilla}
%files anaconda %files anaconda
%if 0%{?fedora} %if 0%{?fedora}
%{_datadir}/%{name}/workflows/workflow_AnacondaFedora.xml %{_datadir}/%{name}/workflows/workflow_AnacondaFedora.xml
%endif %endif
%if 0%{?rhel}
%{_datadir}/%{name}/workflows/workflow_AnacondaRHEL.xml
%endif
%{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml %{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf %config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf
%config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_anaconda_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_anaconda_event.conf
@ -853,6 +820,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif %endif
%changelog %changelog
* Tue Feb 02 2021 Andrei Lukoshko <alukoshko@cloudlinux.com> - 2.9.5-15.alma
- Add support for AlmaLinux Bug Tracker
- Remove libreport-plugin-rhtsupport and libreport-rhel
- Remove libreport-rhel-bugzilla and libreport-rhel-anaconda-bugzilla
* Tue Aug 18 2020 - Ernestas Kulik <ekulik@redhat.com> - 2.9.5-15 * Tue Aug 18 2020 - Ernestas Kulik <ekulik@redhat.com> - 2.9.5-15
- Add patch for rhbz#1867064 - Add patch for rhbz#1867064