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

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

0001-Fix-abrt-xorg-and-abrt-oops-service-starts-failed.patch

@@ -0,0 +1,35 @@
+From 7aa045f5ec0289d8f22349a6c00a2dba926d47fb Mon Sep 17 00:00:00 2001
+From: lei_ju <lj3074194431@163.com>
+Date: Tue, 1 Sep 2020 09:42:46 +0800
+Subject: [PATCH] Fix abrt-xorg and abrt-oops service starts failed
+
+
+diff --git a/init-scripts/abrt-oops.service b/init-scripts/abrt-oops.service
+index 69aaaa9..7cbb0eb 100644
+--- a/init-scripts/abrt-oops.service
++++ b/init-scripts/abrt-oops.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=ABRT kernel log watcher
+ After=abrtd.service
+-Requisite=abrtd.service
++Requires=abrtd.service
+ 
+ [Service]
+ # systemd requires absolute paths to executables
+diff --git a/init-scripts/abrt-xorg.service b/init-scripts/abrt-xorg.service
+index 2719257..a27d7a9 100644
+--- a/init-scripts/abrt-xorg.service
++++ b/init-scripts/abrt-xorg.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=ABRT Xorg log watcher
+ After=abrtd.service
+-Requisite=abrtd.service
++Requires=abrtd.service
+ 
+ [Service]
+ # systemd requires absolute paths to executables
+-- 
+2.23.0
+

abrt.spec

@@ -1,11 +1,12 @@
 Name:          abrt
 Version:       2.13.0
-Release:       7
+Release:       12
 Summary:       A tool for automatic bug detection and reporting
 License:       GPLv2+
 URL:           https://abrt.readthedocs.org/
 Source:        https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 Patch0001:     0001-python-Use-correct-paths-for-installed-modules.patch
+Patch0002:     0001-Fix-abrt-xorg-and-abrt-oops-service-starts-failed.patch
 
 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
@@ -19,7 +20,7 @@ Requires:      libreport >= 2.10.0 satyr >= 0.24
 Requires:      systemd python3-%{name} = %{version}-%{release} python3-augeas python3-dbus
 Requires:      dmidecode
 Requires:      %{name}-libs = %{version}-%{release}
-
+Requires:      %{name}-help = %{version}-%{release}
 Requires(pre): shadow-utils
 %{?systemd_requires}
 
@@ -43,6 +44,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
@@ -174,6 +176,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}
@@ -210,6 +233,14 @@ 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
 
@@ -296,7 +327,6 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di
 %systemd_preun abrtd.service
 
 %preun addon-ccpp
-%systemd_preun abrt-ccpp.service
 %systemd_preun abrt-journal-core.service
 
 %preun addon-kerneloops
@@ -318,7 +348,6 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di
 %systemd_postun_with_restart abrtd.service
 
 %postun addon-ccpp
-%systemd_postun_with_restart abrt-ccpp.service
 %systemd_postun_with_restart abrt-journal-core.service
 
 %postun addon-kerneloops
@@ -417,7 +446,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.*
@@ -542,12 +570,16 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/libreport/events.d/machine-id_event.conf
 %{_libexecdir}/abrt-action-generate-machine-id
 
+%files cli
+
 %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
@@ -570,10 +602,28 @@ 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.13.0-12
+- Added 'Buildarch: noarch' to the help subpackage
+
+* Sat Nov 27 2021 chenchen <chen_aka_jan@163.com> - 2.13.0-11
+- fix uninstall error
+
+* Wed May 19 2021 lingsheng <lingsheng@huawei.com> - 2.13.0-10
+- Add back cli desktop console-notification sub packages
+
+* Fri Nov 06 2020 huanghaitao <huanghaitao8@huawei.com> - 2.13.0-9
+- Make help package required by abrt
+
+* Tue Sep 1 2020 leiju <leiju4@huawei.com> - 2.13.0-8
+- fix abrt-xorg.service and abrt-oops.service starts failed
+
 * Tue Aug 18 2020 lingsheng <lingsheng@huawei.com> - 2.13.0-7
 - fix build error caused by automake update