diff --git a/1001-anolis-libreport-remove-rhtsupport.patch b/1001-anolis-libreport-remove-rhtsupport.patch new file mode 100644 index 0000000000000000000000000000000000000000..3d00b8046f93767c137d59650e45d1a355936950 --- /dev/null +++ b/1001-anolis-libreport-remove-rhtsupport.patch @@ -0,0 +1,304 @@ +From e465c6ded6b2dafe13f8effbd7f218fbd10b2fc3 Mon Sep 17 00:00:00 2001 +From: Liwei Ge +Date: Mon, 13 Sep 2021 16:57:36 +0800 +Subject: [PATCH] rebrand: remove rhtsupport + +Signed-off-by: Liwei Ge +--- + src/plugins/Makefile.am | 33 ------------- + src/plugins/Makefile.in | 107 +++------------------------------------- + 2 files changed, 7 insertions(+), 133 deletions(-) + +diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am +index ec10a81..8be32b2 100644 +--- a/src/plugins/Makefile.am ++++ b/src/plugins/Makefile.am +@@ -12,7 +12,6 @@ reporters_bin += reporter-ureport + endif + + bin_PROGRAMS = $(reporters_bin) \ +- reporter-rhtsupport \ + reporter-kerneloops \ + reporter-upload \ + reporter-mailx \ +@@ -40,7 +39,6 @@ endif + + defaultreportpluginsconfdir = $(DEFAULT_REPORT_PLUGINS_CONF_DIR) + dist_defaultreportpluginsconf_DATA = $(reporters_plugin_conf) \ +- rhtsupport.conf \ + mailx.conf \ + upload.conf \ + ureport.conf +@@ -65,8 +63,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 +@@ -82,7 +78,6 @@ eventsdefdir = $(EVENTS_DEFINITION_DIR) + dist_eventsdef_DATA = \ + mailx_event.conf \ + print_event.conf \ +- rhtsupport_event.conf \ + uploader_event.conf \ + emergencyanalysis_event.conf + +@@ -100,8 +95,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 +@@ -133,32 +126,6 @@ reporter_bugzilla_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 e46e448..2e96cb3 100644 +--- a/src/plugins/Makefile.in ++++ b/src/plugins/Makefile.in +@@ -84,7 +84,7 @@ host_triplet = @host@ + @BUILD_BUGZILLA_TRUE@ report + + @BUILD_UREPORT_TRUE@am__append_2 = reporter-ureport +-bin_PROGRAMS = $(am__EXEEXT_3) reporter-rhtsupport$(EXEEXT) \ ++bin_PROGRAMS = $(am__EXEEXT_3) \ + reporter-kerneloops$(EXEEXT) reporter-upload$(EXEEXT) \ + reporter-mailx$(EXEEXT) reporter-print$(EXEEXT) + @BUILD_BUGZILLA_TRUE@am__append_3 = bugzilla.conf \ +@@ -161,18 +161,6 @@ reporter_mailx_DEPENDENCIES = ../lib/libreport.la + 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 +-reporter_rhtsupport_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) $(reporter_rhtsupport_LDFLAGS) \ +- $(LDFLAGS) -o $@ + am_reporter_upload_OBJECTS = \ + reporter_upload-reporter-upload.$(OBJEXT) + reporter_upload_OBJECTS = $(am_reporter_upload_OBJECTS) +@@ -225,12 +213,12 @@ am__v_CCLD_0 = @echo " CCLD " $@; + am__v_CCLD_1 = + SOURCES = $(report_SOURCES) $(reporter_bugzilla_SOURCES) \ + $(reporter_kerneloops_SOURCES) $(reporter_mailx_SOURCES) \ +- $(reporter_print_SOURCES) $(reporter_rhtsupport_SOURCES) \ ++ $(reporter_print_SOURCES) \ + $(reporter_upload_SOURCES) $(reporter_ureport_SOURCES) + DIST_SOURCES = $(am__report_SOURCES_DIST) \ + $(am__reporter_bugzilla_SOURCES_DIST) \ + $(reporter_kerneloops_SOURCES) $(reporter_mailx_SOURCES) \ +- $(reporter_print_SOURCES) $(reporter_rhtsupport_SOURCES) \ ++ $(reporter_print_SOURCES) \ + $(reporter_upload_SOURCES) \ + $(am__reporter_ureport_SOURCES_DIST) + am__can_run_installinfo = \ +@@ -239,7 +227,7 @@ am__can_run_installinfo = \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac + am__dist_events_DATA_DIST = report_Bugzilla.xml report_uReport.xml \ +- report_Logger.xml report_Mailx.xml report_RHTSupport.xml \ ++ report_Logger.xml report_Mailx.xml \ + report_Kerneloops.xml report_Uploader.xml \ + report_EmergencyAnalysis.xml + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +@@ -272,14 +260,14 @@ am__uninstall_files_from_dir = { \ + am__dist_eventsconf_DATA_DIST = report_Bugzilla.conf \ + report_Logger.conf + am__dist_eventsdef_DATA_DIST = mailx_event.conf print_event.conf \ +- rhtsupport_event.conf uploader_event.conf \ ++ uploader_event.conf \ + emergencyanalysis_event.conf bugzilla_event.conf \ + bugzilla_anaconda_event.conf + am__dist_reportpluginsconf_DATA_DIST = bugzilla.conf \ + bugzilla_format.conf bugzilla_formatdup.conf \ + bugzilla_format_libreport.conf bugzilla_format_kernel.conf \ + bugzilla_format_anaconda.conf bugzilla_formatdup_anaconda.conf \ +- rhtsupport.conf mailx.conf ureport.conf ++ mailx.conf ureport.conf + DATA = $(dist_events_DATA) $(dist_eventsconf_DATA) \ + $(dist_eventsdef_DATA) $(dist_reportpluginsconf_DATA) + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +@@ -523,7 +511,6 @@ pluginsconfdir = $(PLUGINS_CONF_DIR) + reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR) + reporters_plugin_conf = $(am__append_3) + dist_reportpluginsconf_DATA = $(reporters_plugin_conf) \ +- rhtsupport.conf \ + mailx.conf \ + ureport.conf + +@@ -534,7 +521,6 @@ reporters_events_conf = $(am__append_5) + dist_events_DATA = $(reporters_events) \ + report_Logger.xml \ + report_Mailx.xml \ +- report_RHTSupport.xml \ + report_Kerneloops.xml \ + report_Uploader.xml \ + report_EmergencyAnalysis.xml +@@ -544,14 +530,13 @@ 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 $(am__append_7) + reporters_extra_dist = $(am__append_8) $(am__append_9) + EXTRA_DIST = $(reporters_extra_dist) \ + report_Logger.conf \ + report_Logger.xml.in \ + report_Mailx.xml.in \ +- report_RHTSupport.xml.in \ + report_Kerneloops.xml.in \ + report_Uploader.xml.in \ + report_EmergencyAnalysis.xml.in +@@ -580,35 +565,6 @@ EXTRA_DIST = $(reporters_extra_dist) \ + @BUILD_BUGZILLA_TRUE@ ../lib/libreport-web.la \ + @BUILD_BUGZILLA_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_LDFLAGS = -ltar +-reporter_rhtsupport_LDADD = \ +- $(GLIB_LIBS) \ +- $(LIBXML_LIBS) \ +- ../lib/libreport-web.la \ +- ../lib/libreport.la +- + reporter_upload_SOURCES = \ + reporter-upload.c + +@@ -832,10 +788,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)$(reporter_rhtsupport_LINK) $(reporter_rhtsupport_OBJECTS) $(reporter_rhtsupport_LDADD) $(LIBS) +- + reporter-upload$(EXEEXT): $(reporter_upload_OBJECTS) $(reporter_upload_DEPENDENCIES) $(EXTRA_reporter_upload_DEPENDENCIES) + @rm -f reporter-upload$(EXEEXT) + $(AM_V_CCLD)$(reporter_upload_LINK) $(reporter_upload_OBJECTS) $(reporter_upload_LDADD) $(LIBS) +@@ -856,9 +808,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_kerneloops-reporter-kerneloops.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_mailx-reporter-mailx.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_upload-reporter-upload.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reporter_ureport-ureport.Po@am__quote@ + +@@ -967,48 +916,6 @@ reporter_print-reporter-print.obj: reporter-print.c + @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_upload-reporter-upload.o: reporter-upload.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(reporter_upload_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reporter_upload-reporter-upload.o -MD -MP -MF $(DEPDIR)/reporter_upload-reporter-upload.Tpo -c -o reporter_upload-reporter-upload.o `test -f 'reporter-upload.c' || echo '$(srcdir)/'`reporter-upload.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reporter_upload-reporter-upload.Tpo $(DEPDIR)/reporter_upload-reporter-upload.Po +-- +2.27.0 + diff --git a/libreport.spec b/libreport.spec index b316a0f7e09d501b7ae08d57bb161e7364a4ce6b..73529d31bb486d991e499270fc5a183f266e8f26 100644 --- a/libreport.spec +++ b/libreport.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %{!?python_site: %define python_site %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} # platform-dependent %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -7,7 +8,7 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.1.11 -Release: 53%{?dist} +Release: 53%{anolis_release}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://fedorahosted.org/abrt/ @@ -311,6 +312,10 @@ Patch273: 0273-lib-problem_data-Add-a-null-guard-for-g_strsplit-cal.patch Patch274: 0274-Update-translations.patch # git format-patch 2.1.11-52.el7 -N --start-number=275 --topo-order +# Add by Anolis +Patch1001: 1001-anolis-libreport-remove-rhtsupport.patch +# End + # git is need for '%%autosetup -S git' which automatically applies all the # patches above. Please, be aware that the patches must be generated # by 'git format-patch' @@ -499,6 +504,7 @@ Uploads micro-report to abrt server %description plugin-bugzilla Plugin to report bugs into the bugzilla. +%if 0%{?rhel} && ! 0%{?anolis} %package plugin-rhtsupport Summary: %{name}'s RHTSupport plugin Group: System Environment/Libraries @@ -507,13 +513,16 @@ Requires: libreport-web = %{version}-%{release} %description plugin-rhtsupport Plugin to report bugs into RH support system. +%endif %package compat Summary: %{name}'s compat layer for obsoleted 'report' package Group: System Environment/Libraries Requires: libreport = %{version}-%{release} Requires: %{name}-plugin-bugzilla = %{version}-%{release} +%if 0%{?rhel} && ! 0%{?anolis} Requires: %{name}-plugin-rhtsupport = %{version}-%{release} +%endif %description compat Provides 'report' command-line tool. @@ -539,7 +548,7 @@ easily configure the reporting process for Fedora systems. Just install this package and you're done. %endif -%if 0%{?rhel} +%if 0%{?rhel} && ! 0%{?anolis} %package rhel Summary: Default configuration for reporting bugs via Red Hat infrastructure Group: Applications/File @@ -581,7 +590,7 @@ Requires: %{name} = %{version}-%{release} Requires: libreport-plugin-reportuploader = %{version}-%{release} # The line below should be removed in RHEL7 GA Requires: libreport-plugin-bugzilla = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} && ! 0%{?anolis} Requires: libreport-plugin-rhtsupport = %{version}-%{release} %endif @@ -641,39 +650,68 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man5/report_fedora.conf.5 rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_AnacondaFedora.xml %endif +# Remove unwanted CentOS specific workflow configuration files +%if 0%{!?centos:1} +rm -f $RPM_BUILD_ROOT%{_datadir}/libreport/workflows/workflow_CentOSCCpp.xml +rm -f $RPM_BUILD_ROOT%{_datadir}/libreport/workflows/workflow_CentOSKerneloops.xml +rm -f $RPM_BUILD_ROOT%{_datadir}/libreport/workflows/workflow_CentOSPython.xml +rm -f $RPM_BUILD_ROOT%{_datadir}/libreport/workflows/workflow_CentOSVmcore.xml +rm -f $RPM_BUILD_ROOT%{_datadir}/libreport/workflows/workflow_CentOSXorg.xml +rm -f $RPM_BUILD_ROOT%{_datadir}/libreport/workflows/workflow_CentOSLibreport.xml +rm -f $RPM_BUILD_ROOT%{_datadir}/libreport/workflows/workflow_CentOSJava.xml +rm -f $RPM_BUILD_ROOT%{_datadir}/libreport/workflows/workflow_CentOSJavaScript.xml +rm -f $RPM_BUILD_ROOT%{_datadir}/libreport/workflows/workflow_AnacondaCentOS.xml +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/workflows/workflow_CentOSPython3.xml +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/events/report_CentOSBugTracker.xml +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libreport/events/report_CentOSBugTracker.conf +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libreport/workflows.d/report_centos.conf +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libreport/events.d/centos_report_event.conf +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/report_centos.conf.5 +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/report_CentOSBugTracker.conf.5 +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/centos_report_event.conf.5 +%endif + # Remove unwanted RHEL specific workflow configuration files -%if 0%{!?rhel:1} -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELCCpp.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELKerneloops.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELPython.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELvmcore.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELxorg.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELLibreport.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELJava.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_uReport.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_AnacondaRHEL.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_AnacondaRHELBugzilla.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELBugzillaCCpp.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELBugzillaKerneloops.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELBugzillaPython.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELBugzillaVmcore.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELBugzillaXorg.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELBugzillaLibreport.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELBugzillaJava.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELAddDataCCpp.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELAddDataJava.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELAddDataKerneloops.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELAddDataLibreport.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELAddDataPython.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELAddDatavmcore.xml -rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELAddDataxorg.xml -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows.d/report_rhel.conf -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows.d/report_uReport.conf -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf -rm -f $RPM_BUILD_ROOT%{_mandir}/man5/report_rhel.conf.5 -rm -f $RPM_BUILD_ROOT%{_mandir}/man5/report_uReport.conf.5 -rm -f $RPM_BUILD_ROOT%{_mandir}/man5/report_rhel_bugzilla.conf.5 +%if 0%{!?rhel:1} || 0%{?anolis} +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_RHELPython.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELvmcore.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELxorg.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELLibreport.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELJava.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELJavaScript.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_uReport.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaRHEL.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaRHELBugzilla.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaCCpp.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaKerneloops.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaPython.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaVmcore.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaXorg.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaLibreport.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaJava.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaJavaScript.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataCCpp.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataKerneloops.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataPython.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDatavmcore.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataxorg.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataLibreport.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataJava.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataJavaScript.xml +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_uReport.conf +rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf +rm -f %{buildroot}%{_mandir}/man5/report_rhel.conf.5 +rm -f %{buildroot}%{_mandir}/man5/report_uReport.conf.5 +rm -f %{buildroot}%{_mandir}/man5/report_rhel_bugzilla.conf.5 +rm -f $RPM_BUILD_ROOT/%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.rhtsupport.xml +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/reporter-rhtsupport.1* +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/rhtsupport.conf.5* +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/rhtsupport_event.conf.5* +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/cert-api.access.redhat.com.pem %endif %clean @@ -872,6 +910,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/bugzilla_format_kernel.conf.5.* %{_bindir}/reporter-bugzilla +%if 0%{?rhel} && ! 0%{?anolis} %files plugin-rhtsupport %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf @@ -885,6 +924,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/rhtsupport.conf.5.* %{_mandir}/man5/rhtsupport_event.conf.5.* %{_bindir}/reporter-rhtsupport +%endif %files compat %defattr(-,root,root,-) @@ -922,9 +962,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/report_fedora.conf.5.* %endif -%if 0%{?rhel} +%if 0%{?rhel} && ! 0%{?anolis} %files rhel -%defattr(-,root,root,-) %{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml %{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml %{_datadir}/%{name}/workflows/workflow_RHELPython.xml @@ -968,7 +1007,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %if 0%{?fedora} %{_datadir}/%{name}/workflows/workflow_AnacondaFedora.xml %endif -%if 0%{?rhel} +%if 0%{?rhel} && ! 0%{?anolis} %{_datadir}/%{name}/workflows/workflow_AnacondaRHEL.xml %endif %{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml @@ -983,6 +1022,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Dec 06 2021 yangxianzhao - 2.1.11-53.01 +- Disable centos sub package +- Remove unused sub packages + * Mon Nov 11 2019 Ernestas Kulik - 2.1.11-53 - Rebuild due to translations not being merged