!38 【轻量级 PR】：Added 'Buildarch: noarch' to the help subpackage

From: @liyuzhe_046 
Reviewed-by: @wk333 
Signed-off-by: @wk333

0001-applet-Pass-instance-pointer-to-signal-handler.patch

@@ -1,28 +0,0 @@
-From 5618985d3d7f830ebba0ef78e2ee6d3d6f9f6c55 Mon Sep 17 00:00:00 2001
-From: Ernestas Kulik <ekulik@redhat.com>
-Date: Fri, 15 May 2020 15:49:59 +0200
-Subject: [PATCH] applet: Pass instance pointer to signal handler
-
-Some fallout from 802a40a2f7c971b6533162e70b860e01ae3b5a27.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1836190
----
- src/applet/abrt-applet-application.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c
-index d982c9f9..8ea653bb 100644
---- a/src/applet/abrt-applet-application.c
-+++ b/src/applet/abrt-applet-application.c
-@@ -177,7 +177,7 @@ abrt_applet_application_init (AbrtAppletApplication *self)
-     g_signal_connect (network_monitor, "notify::connectivity",
-                       G_CALLBACK (on_connectivity_changed), self);
-     g_signal_connect (network_monitor, "notify::network-available",
--                      G_CALLBACK (on_connectivity_changed), NULL);
-+                      G_CALLBACK (on_connectivity_changed), self);
- 
-     self->deferred_problems = g_ptr_array_new_with_free_func (g_object_unref);
- }
--- 
-2.26.2
-

0002-applet-Chain-up-in-dispose.patch

@@ -1,26 +0,0 @@
-From b08e7cbd26704b0a5400fdfab1f3f2e3922b102f Mon Sep 17 00:00:00 2001
-From: Ernestas Kulik <ekulik@redhat.com>
-Date: Fri, 15 May 2020 15:50:50 +0200
-Subject: [PATCH] applet: Chain up in dispose()
-
-Also something missed in 802a40a2f7c971b6533162e70b860e01ae3b5a27.
----
- src/applet/abrt-applet-application.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c
-index 8ea653bb..52ed5529 100644
---- a/src/applet/abrt-applet-application.c
-+++ b/src/applet/abrt-applet-application.c
-@@ -985,6 +985,8 @@ abrt_applet_application_dispose (GObject *object)
-     self = ABRT_APPLET_APPLICATION (object);
- 
-     g_clear_pointer (&self->deferred_problems, g_ptr_array_unref);
-+
-+    G_OBJECT_CLASS (abrt_applet_application_parent_class)->dispose (object);
- }
- 
- static void
--- 
-2.26.2
-

0003-applet-application-Fix-crash-when-processing-deferre.patch

@@ -1,59 +0,0 @@
-From b28fcc053db224c11f1f88d2885eba88d60a7322 Mon Sep 17 00:00:00 2001
-From: Ernestas Kulik <ekulik@redhat.com>
-Date: Tue, 28 Jul 2020 15:39:43 +0200
-Subject: [PATCH] applet: application: Fix crash when processing deferred
-
-Currently, when processing the deferred problems, if reporting fails,
-the problem is re-added to the queue, but the object is not
-re-referenced, leading to invalid reads later on.
----
- src/applet/abrt-applet-application.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c
-index 28e55135..4716524b 100644
---- a/src/applet/abrt-applet-application.c
-+++ b/src/applet/abrt-applet-application.c
-@@ -771,11 +771,9 @@ handle_event_output_cb (GIOChannel   *gio,
-                         gpointer      data)
- {
-     EventProcessingState *state;
--    AbrtAppletProblemInfo *problem_info;
-     int status;
- 
-     state = data;
--    problem_info = state->problem_info;
- 
-     /* Read streamed data and split lines */
-     for (;;)
-@@ -836,21 +834,23 @@ handle_event_output_cb (GIOChannel   *gio,
- 
-     if (WIFEXITED (status) && WEXITSTATUS (status) == EXIT_STOP_EVENT_RUN)
-     {
--        abrt_applet_problem_info_set_known (problem_info, true);
-+        abrt_applet_problem_info_set_known (state->problem_info, true);
-         status = 0;
-     }
- 
-     if (status == 0)
-     {
--        abrt_applet_problem_info_set_reported (problem_info, true);
-+        abrt_applet_problem_info_set_reported (state->problem_info, true);
- 
-         log_debug ("fast report finished successfully");
--        abrt_applet_application_send_problem_notification (state->application, problem_info);
-+        abrt_applet_application_send_problem_notification (state->application,
-+                                                           state->problem_info);
-     }
-     else
-     {
-         log_debug ("fast report failed, deferring");
--        g_ptr_array_add (state->application->deferred_problems, problem_info);
-+        g_ptr_array_add (state->application->deferred_problems,
-+                         g_steal_pointer (&state->problem_info));
-     }
- 
-     event_processing_state_free (state);
--- 
-2.26.2
-

abrt.spec

@@ -1,29 +1,25 @@
 Name:          abrt
-Version:       2.14.2
-Release:       3
+Version:       2.16.1
+Release:       2
 Summary:       A tool for automatic bug detection and reporting
-License:       GPLv2+
+License:       GPL-2.0-or-later
 URL:           https://github.com/abrt/abrt/
-Source:        https://github.com/abrt/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-
-Patch0001:     0001-applet-Pass-instance-pointer-to-signal-handler.patch 
-Patch0002:     0002-applet-Chain-up-in-dispose.patch
-Patch0003:     0003-applet-application-Fix-crash-when-processing-deferre.patch
+Source:        https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires: git-core dbus-devel hostname gtk3-devel glib2-devel >= 2.43.4 rpm-devel >= 4.6
 BuildRequires: desktop-file-utils libnotify-devel gettext libxml2-devel intltool libtool
-BuildRequires: libsoup-devel asciidoc doxygen xmlto libreport-devel >= 2.13.0 python3-pytest
+BuildRequires: libsoup3-devel asciidoc doxygen xmlto libreport-devel >= 2.13.0 python3-pytest
 BuildRequires: satyr-devel >= 0.24 augeas libselinux-devel python3-devel python3-systemd
-BuildRequires: python3-nose python3-sphinx python3-libreport python3-devel python3-argcomplete
+BuildRequires: python3-nose2 python3-sphinx python3-libreport python3-devel python3-argcomplete
 BuildRequires: libreport-gtk-devel >= 2.13.0 gsettings-desktop-schemas-devel >= 3.15
-BuildRequires: gdb-headless libcap-devel systemd-devel json-c-devel  gdb-headless polkit-devel
-
+BuildRequires: gdb-headless libcap-devel systemd-devel json-c-devel  gdb-headless polkit-devel python3-dbus
 
 Requires:      libreport >= 2.13.0 satyr >= 0.24
 Requires:      systemd python3-%{name} = %{version}-%{release} python3-augeas python3-dbus
 Requires:      dmidecode
 Requires:      %{name}-libs = %{version}-%{release}
 
+Obsoletes:     abrt-plugin-sosreport < 2.14.5
 Requires(pre): shadow-utils
 %{?systemd_requires}
 
@@ -47,6 +43,7 @@ This package contains development and header files for abrt.
 
 %package help
 Summary:   Help files for the abrt library
+Buildarch: noarch
 Requires:  %{name} = %{version}-%{release}
 
 %description help
@@ -75,8 +72,9 @@ This package contains development and header files for abrt-gui.
 %package addon-ccpp
 Summary:   C/C++ addon module for abrt
 Requires:  cpio gdb-headless elfutils %{name} = %{version}-%{release} python3-libreport
-Requires:  %{name}-libs = %{version}-%{release}
+Requires:  %{name}-libs = %{version}-%{release} elfutils-debuginfod-client
 Obsoletes: abrt-addon-coredump-helper <= 2.12.2
+Obsoletes: abrt-retrace-client <= 2.15.1
 
 %description addon-ccpp
 C/C++ analyzer plugin for abrt.
@@ -89,13 +87,6 @@ Requires: %{name}-libs = %{version}-%{release}
 %description addon-upload-watch
 This addon-upload-watch package provides hook for uploaded problems.
 
-%package retrace-client
-Summary:  retrace client module for abrt
-Requires: %{name} = %{version}-%{release} xz tar p11-kit-trust libsoup
-
-%description retrace-client
-Retrace server's client application that helps to analyze C/C++ crashes remotely.
-
 %package addon-kerneloops
 Summary:  Kerneloops addon for abrt
 Requires: curl %{name} = %{version}-%{release}
@@ -117,7 +108,7 @@ from Xorg log.
 %package addon-vmcore
 Summary:  Vmcore addon module for abrt
 Requires: %{name} = %{version}-%{release} abrt-addon-kerneloops kexec-tools
-Requires: python3-abrt python3-augeas util-linux
+Requires: python3-abrt python3-augeas util-linux python3-systemd
 
 %description addon-vmcore
 This package provides plugin which helps to  collect kernel crash information
@@ -143,6 +134,7 @@ uncaught exception in python3 programs.
 
 %package -n python3-abrt-container-addon
 Summary:   Container addon for catching Python3 exceptions for abrt
+BuildArch: noarch
 Conflicts: python3-abrt-addon
 Requires:  container-exception-logger
 
@@ -150,14 +142,6 @@ Requires:  container-exception-logger
 This package provides python3 hook and handling uncaught exception in python3
 container's programs.
 
-%package plugin-sosreport
-Summary:  Plugin for building automatic sosreports for abrt
-Requires: sos >= 3.6 %{name} = %{version}-%{release}
-
-%description plugin-sosreport
-This package provides a configuration snippet for abrt events which used to enable
-automatic generation of sosreports.
-
 %package plugin-machine-id
 Summary:  Plugin to generate machine_id based off dmidecode for abrt
 Requires: %{name} = %{version}-%{release}
@@ -168,6 +152,7 @@ automatic generation of machine_id.
 
 %package tui
 Summary:   Command line interface of abrt
+BuildArch: noarch
 Requires:  %{name} = %{version}-%{release} libreport-cli >= 2.10.0
 Requires:  %{name}-libs = %{version}-%{release} abrt-dbus python3-abrt
 Requires:  abrt-addon-ccpp python3-argcomplete
@@ -178,6 +163,27 @@ Obsoletes: %{name}-cli-ng < 2.12.2
 This package provides a simple command line client for abrt event reports
 in command line environment.
 
+%package cli
+Summary:  Make easy default installation on non-graphical environments for virtual package
+Requires: %{name} = %{version}-%{release} abrt-tui abrt-addon-kerneloops
+Requires: abrt-addon-pstoreoops abrt-addon-vmcore abrt-addon-ccpp python3-abrt-addon
+Requires: abrt-addon-xorg
+
+%description cli
+This virtual package is used to install all necessary packages for usage from command line
+environment.
+
+%package desktop
+Summary:  Make easy default installation on desktop environments for virtual package
+Requires: %{name} = %{version}-%{release} abrt-addon-kerneloops abrt-addon-pstoreoops
+Requires: abrt-addon-vmcore abrt-addon-ccpp python3-abrt-addon abrt-addon-xorg
+Requires: gdb-headless abrt-gui gnome-abrt
+Provides: bug-buddy = %{version}-%{release}
+
+%description desktop
+This virtual pacakge is used to install all necessary packages for usage from desktop
+environment.
+
 %package atomic
 Summary:   Package to make easy default installation on Atomic hosts.
 Requires:  %{name}-libs = %{version}-%{release}
@@ -214,16 +220,22 @@ Requires:  %{name} = %{version}-%{release} python3-%{name} = %{version}-%{releas
 %description -n python3-abrt-doc
 This package provides examples and documentation for ABRT Python3 API.
 
+%package console-notification
+Summary:  Console notification script of abrt
+Requires: %{name} = %{version}-%{release} %{name}-cli = %{version}-%{release}
+
+%description console-notification
+This pacakge provides small script which prints a count of detected problems when
+someone logs in to the shell.
+
 %prep
 %global __scm_apply_git(qp:m:) %{__git} am --exclude doc/design --exclude doc/project/abrt.tex
 
 %autosetup -n %{name}-%{version} -p1
 
 %build
-autoscan
-aclocal
-autoconf
-automake --add-missing
+./autogen.sh
+
 
 CFLAGS="%{optflags}" %configure \
         --without-bodhi  \
@@ -256,10 +268,7 @@ ln -sf %{_bindir}/abrt %{buildroot}%{_bindir}/abrt-cli
 ln -sf %{_mandir}/man1/abrt.1 %{buildroot}%{_mandir}/man1/abrt-cli.1
 
 %check
-make check|| {
-    find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \;
-    exit 1
-}
+make check
 
 %pre
 %define abrt_gid_uid 173
@@ -419,7 +428,6 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %ghost %attr(0666, -, -) %{_localstatedir}/run/%{name}/abrt.socket
 %ghost %attr(0644, -, -) %{_localstatedir}/run/%{name}/abrtd.pid
 %exclude %{_infodir}/dir
-%exclude %{_sysconfdir}/profile.d/abrt-console-notification.sh
 
 %files libs
 %{_libdir}/libabrt.so.*
@@ -428,6 +436,8 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %dir %{_datadir}/%{name}
 %{_datadir}/augeas/lenses/abrt.aug
 
+%files cli
+
 %files devel
 %doc apidoc/html/*.{html,png,css,js}
 %{_includedir}/abrt/{abrt-dbus,hooklib,libabrt,problem_api}.h
@@ -457,19 +467,13 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %{_libexecdir}/abrt-gdb-exploitable
 %{_journalcatalogdir}/abrt_ccpp.catalog
 %{_unitdir}/abrt-journal-core.service
-
-%attr(6755, abrt, abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache
-
 %{_bindir}/abrt-action-analyze-c
 %{_bindir}/abrt-action-trim-files
-%{_bindir}/abrt-action-analyze-core
 %{_bindir}/abrt-action-analyze-vulnerability
-%{_bindir}/abrt-action-install-debuginfo
 %{_bindir}/abrt-action-generate-backtrace
 %{_bindir}/abrt-action-generate-core-backtrace
 %{_bindir}/abrt-action-analyze-backtrace
 %{_bindir}/abrt-action-list-dsos
-%{_bindir}/abrt-action-perform-ccpp-analysis
 %{_bindir}/abrt-action-analyze-ccpp-local
 %{_bindir}/abrt-dump-journal-core
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf
@@ -479,7 +483,6 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/libreport/events.d/vimrc_event.conf
 %{_datadir}/libreport/events/analyze_CCpp.xml
 %{_datadir}/libreport/events/analyze_LocalGDB.xml
-%{_datadir}/libreport/events/analyze_RetraceServer.xml
 %{_datadir}/libreport/events/collect_*.xml
 %{_datadir}/libreport/events/post_report.xml
 
@@ -487,10 +490,6 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %{_sbindir}/abrt-upload-watch
 %{_unitdir}/abrt-upload-watch.service
 
-%files retrace-client
-%{_bindir}/abrt-retrace-client
-%config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf
-
 %files addon-kerneloops
 %{_unitdir}/abrt-oops.service
 %{_journalcatalogdir}/abrt_koops.catalog
@@ -539,19 +538,17 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %{python3_sitelib}/abrt_exception_handler3_container.py
 %{python3_sitelib}/__pycache__/abrt_exception_handler3_container.*
 
-%files plugin-sosreport
-%config(noreplace) %{_sysconfdir}/libreport/events.d/sosreport_event.conf
-
 %files plugin-machine-id
 %config(noreplace) %{_sysconfdir}/libreport/events.d/machine-id_event.conf
 %{_libexecdir}/abrt-action-generate-machine-id
 
 %files tui
-%config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion
 %{_bindir}/abrt
 %{_bindir}/abrt-cli
 %{python3_sitelib}/abrtcli/
 
+%files desktop
+
 %files atomic
 %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf
 %{_bindir}/abrt-action-save-package-data
@@ -574,10 +571,25 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %files -n python3-abrt-doc
 %{python3_sitelib}/problem_examples
 
+%files console-notification
+%config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
+
 %files help
 %{_mandir}/man*/*
 
 %changelog
+* Tue Aug 13 2024 liyuzhe <liyuzhe@cqsoftware.com.cn> - 2.16.1-2
+- Added 'Buildarch: noarch' to the help subpackage
+
+* Tue May 9 2023 liyanan <thistleslyn@163.com> - 2.16.1-1
+- update to 2.16.1
+
+* Thu Apr 07 2022 yangping <yangping69@h-partners.com> - 2.14.6-1
+- update to v2.14.6
+
+* Wed May 19 2021 lingsheng <lingsheng@huawei.com> - 2.14.2-4
+- Add back cli desktop console-notification sub packages
+
 * Thu Dec 03 2020 Ge Wang <wangge20@huawei.com> - 2.14.2-3
 - modify source0 url