From 81d1c85f4cda013493f585965362794f38c3983d Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Wed, 3 Jul 2019 17:45:54 +0200 Subject: [PATCH 01/10] New upstream release version 2.12.1 * Remove gen-version from spec - This is upstream script to generate version. This is not needed in dist-git. [2.12.1] Added - Require dbus-tools for dbus-send command. Changed - ABRT won't process crashes coming from unpackaged applications by default. - Completely removed support for Python2. - Update new ABRT icon. - retrace-client defaults to https. - Updated man pages. - Removed configurations from /usr/share/abrt. - Removed provides for abrt-python packages. Fixed - Gracefully handle exceptions comming from abrt-action-generate-machine-id. - Gracefully handle exceptions comming from abrt-action-install-debuginfo. - Use correct name of environment variable for retrace-server. Signed-off-by: Martin Kutlak --- .gitignore | 1 + abrt.spec | 222 ++++++++++++----------------------------------------- sources | 2 +- 3 files changed, 49 insertions(+), 176 deletions(-) diff --git a/.gitignore b/.gitignore index 16e185b..740a5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ abrt-1.1.13.tar.gz /abrt-2.11.0.tar.gz /abrt-2.11.1.tar.gz /abrt-2.12.0.tar.gz +/abrt-2.12.1.tar.gz diff --git a/abrt.spec b/abrt.spec index d6eb422..2c1616f 100644 --- a/abrt.spec +++ b/abrt.spec @@ -9,13 +9,6 @@ %bcond_with python3 %endif -%if 0%{?rhel} > 7 || 0%{?fedora} > 28 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - %if 0%{?rhel}%{?suse_version} %bcond_with bodhi %else @@ -52,8 +45,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.12.0 -Release: 2%{?dist} +Version: 2.12.1 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -77,13 +70,6 @@ BuildRequires: libreport-devel >= %{libreport_ver} BuildRequires: satyr-devel >= %{satyr_ver} BuildRequires: augeas BuildRequires: libselinux-devel -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-systemd -BuildRequires: python2-argcomplete -BuildRequires: python2-argh -BuildRequires: python2-humanize -%endif # with python2 %if %{with python3} BuildRequires: python3-devel BuildRequires: python3-systemd @@ -109,11 +95,6 @@ Requires(pre): %{shadow_utils} %if %{with python3} Requires: python3-augeas Requires: python3-dbus -%else -%if %{with python2} -Requires: python2-augeas -Requires: python2-dbus -%endif # with python2 %endif # with python3 %ifarch aarch64 i686 x86_64 Requires: dmidecode @@ -144,13 +125,6 @@ BuildRequires: libreport-web-devel >= %{libreport_ver} BuildRequires: gdb-headless #dbus BuildRequires: polkit-devel -%if %{with python2} -#python2-abrt -BuildRequires: python2-sphinx -BuildRequires: python2-libreport -#python2-abrt-doc -BuildRequires: python2-devel -%endif # with python2 %if %{with python3} #python3-abrt BuildRequires: python3-nose @@ -229,10 +203,6 @@ Requires: %{name}-addon-coredump-helper = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} %if %{with python3} Requires: python3-libreport -%else -%if %{with python2} -Requires: python2-libreport -%endif # with python2 %endif # with python3 @@ -290,11 +260,6 @@ Requires: kexec-tools %if %{with python3} Requires: python3-abrt Requires: python3-augeas -%else -%if %{with python2} -Requires: python2-abrt -Requires: python2-augeas -%endif # with python2 %endif # with python3 Requires: util-linux @@ -323,41 +288,12 @@ Provides: libreport-plugin-bodhi = %{version}-%{release} Search for a new updates in bodhi server. %endif -%if %{with python2} -%package -n python2-abrt-addon -Summary: %{name}'s addon for catching and analyzing Python exceptions -Requires: %{name} = %{version}-%{release} -Requires: python2-systemd -Requires: python2-abrt -# Remove before F30 -Provides: abrt-addon-python = %{version}-%{release} -Provides: abrt-addon-python%{?_isa} = %{version}-%{release} -Obsoletes: abrt-addon-python < 2.10.4 - -%description -n python2-abrt-addon -This package contains python hook and python analyzer plugin for handling -uncaught exception in python programs. - -%package -n python2-abrt-container-addon -Summary: %{name}'s container addon for catching Python 2 exceptions -Conflicts: python2-abrt-addon -Requires: container-exception-logger - -%description -n python2-abrt-container-addon -This package contains python 2 hook and handling uncaught exception in python 2 -programs in container. -%endif # with python2 - %if %{with python3} %package -n python3-abrt-addon Summary: %{name}'s addon for catching and analyzing Python 3 exceptions Requires: %{name} = %{version}-%{release} Requires: python3-systemd Requires: python3-abrt -# Remove before F30 -Provides: abrt-addon-python3 = %{version}-%{release} -Provides: abrt-addon-python3%{?_isa} = %{version}-%{release} -Obsoletes: abrt-addon-python3 < 2.10.4 %description -n python3-abrt-addon This package contains python 3 hook and python analyzer plugin for handling @@ -511,47 +447,12 @@ hosts. Summary: ABRT DBus service Requires: %{name} = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} +Requires: dbus-tools %description dbus ABRT DBus service which provides org.freedesktop.problems API on dbus and uses PolicyKit to authorize to access the problem data. -%if %{with python2} -%package -n python2-abrt -Summary: ABRT Python API -Requires: %{name} = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-dbus = %{version}-%{release} -Requires: python2-dbus -Requires: python2-libreport -%if 0%{?rhel:%{rhel} == 7} -Requires: python-gobject-base -%else -Requires: python2-gobject-base -%endif -%{?python_provide:%python_provide python2-abrt} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < 2.10.4 - -%description -n python2-abrt -High-level API for querying, creating and manipulating -problems handled by ABRT in Python. - -%package -n python2-abrt-doc -Summary: ABRT Python API Documentation -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: python2-abrt = %{version}-%{release} -# Remove before F30 -Provides: %{name}-python-doc = %{version}-%{release} -Obsoletes: %{name}-python-doc < 2.10.4 - -%description -n python2-abrt-doc -Examples and documentation for ABRT Python API. -%endif # with python2 - %if %{with python3} %package -n python3-abrt Summary: ABRT Python 3 API @@ -560,11 +461,6 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: python3-dbus Requires: python3-libreport -%{?python_provide:%python_provide python3-abrt} -# Remove before F30 -Provides: %{name}-python3 = %{version}-%{release} -Provides: %{name}-python3%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python3 < 2.10.4 Requires: python3-gobject-base %description -n python3-abrt @@ -576,9 +472,6 @@ Summary: ABRT Python API Documentation BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: python3-%{name} = %{version}-%{release} -# Remove before F30 -Provides: %{name}-python3-doc = %{version}-%{release} -Obsoletes: %{name}-python3-doc < 2.10.4 %description -n python3-abrt-doc Examples and documentation for ABRT Python 3 API. @@ -601,14 +494,10 @@ to the shell %build %define var_base_dir spool -./gen-version autoreconf -if intltoolize --automake -c -f %configure \ -%if %{without python2} - --without-python2 \ -%endif # with python2 %if %{without python3} --without-python3 \ %endif # with python3 @@ -702,11 +591,6 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %systemd_post abrt-xorg.service %journal_catalog_update -%if %{with python2} -%post -n python2-abrt-addon -%journal_catalog_update -%endif # with python2 - %if %{with python3} %post -n python3-abrt-addon %journal_catalog_update @@ -776,25 +660,15 @@ if [ -f /etc/abrt/plugins/CCpp.conf ]; then mv /etc/abrt/plugins/CCpp.conf /etc/abrt/plugins/CCpp.conf.rpmsave.atomic || exit 1; fi ln -sf /etc/abrt/plugins/CCpp_Atomic.conf /etc/abrt/plugins/CCpp.conf -if [ -f /usr/share/abrt/conf.d/plugins/CCpp.conf ]; then - mv /usr/share/abrt/conf.d/plugins/CCpp.conf /usr/share/abrt/conf.d/plugins/CCpp.conf.rpmsave.atomic || exit 1; -fi -ln -sf /usr/share/abrt/conf.d/plugins/CCpp_Atomic.conf /usr/share/abrt/conf.d/plugins/CCpp.conf %systemd_post abrt-coredump-helper.service %preun atomic if [ -L /etc/abrt/plugins/CCpp.conf ]; then rm /etc/abrt/plugins/CCpp.conf fi -if [ -L /usr/share/abrt/conf.d/plugins/CCpp.conf ]; then - rm /usr/share/abrt/conf.d/plugins/CCpp.conf -fi if [ -f /etc/abrt/plugins/CCpp.conf.rpmsave.atomic ]; then mv /etc/abrt/plugins/CCpp.conf.rpmsave.atomic /etc/abrt/plugins/CCpp.conf || exit 1 fi -if [ -f /usr/share/abrt/conf.d/plugins/CCpp.conf.rpmsave.atomic ]; then - mv /usr/share/abrt/conf.d/plugins/CCpp.conf.rpmsave.atomic /usr/share/abrt/conf.d/plugins/CCpp.conf || exit 1 -fi %postun atomic %systemd_postun_with_restart abrt-coredump-helper.service @@ -895,12 +769,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_bindir}/abrt-action-analyze-xorg %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.problems.daemon.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf -%{_datadir}/%{name}/conf.d/abrt-action-save-package-data.conf %config(noreplace) %{_sysconfdir}/%{name}/plugins/xorg.conf -%{_datadir}/%{name}/conf.d/plugins/xorg.conf %{_mandir}/man5/abrt-xorg.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys.conf -%{_datadir}/%{name}/conf.d/gpg_keys.conf %{_mandir}/man5/gpg_keys.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_event.conf %{_mandir}/man5/abrt_event.conf.5* @@ -927,13 +798,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %files libs %{_libdir}/libabrt.so.* %config(noreplace) %{_sysconfdir}/%{name}/abrt.conf -%{_datadir}/%{name}/conf.d/abrt.conf %{_mandir}/man5/abrt.conf.5* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/conf.d -%dir %{_datadir}/%{name}/conf.d/plugins # filesystem package should own /usr/share/augeas/lenses directory %{_datadir}/augeas/lenses/abrt.aug @@ -961,8 +828,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %dir %{_datadir}/%{name} # all glade, gtkbuilder and py files for gui %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/icons/hicolor/*/status/* -%{_datadir}/%{name}/icons/hicolor/*/status/* %{_datadir}/%{name}/ui/* %{_bindir}/abrt-applet %{_bindir}/system-config-abrt @@ -980,7 +845,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %files addon-ccpp %dir %attr(0775, abrt, abrt) %{_localstatedir}/cache/abrt-di %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf -%{_datadir}/%{name}/conf.d/plugins/CCpp.conf %{_mandir}/man5/abrt-CCpp.conf.5* %{_libexecdir}/abrt-gdb-exploitable %{_journalcatalogdir}/abrt_ccpp.catalog @@ -1052,7 +916,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_koops_format.conf %{_mandir}/man5/koops_event.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/plugins/oops.conf -%{_datadir}/%{name}/conf.d/plugins/oops.conf %{_unitdir}/abrt-oops.service %dir %{_localstatedir}/lib/abrt @@ -1080,7 +943,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf %{_mandir}/man5/vmcore_event.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/plugins/vmcore.conf -%{_datadir}/%{name}/conf.d/plugins/vmcore.conf %{_datadir}/libreport/events/analyze_VMcore.xml %{_unitdir}/abrt-vmcore.service %{_sbindir}/abrt-harvest-vmcore @@ -1101,30 +963,12 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-harvest-pstoreoops.1* %{_mandir}/man1/abrt-merge-pstoreoops.1* -%if %{with python2} -%files -n python2-abrt-addon -%config(noreplace) %{_sysconfdir}/%{name}/plugins/python.conf -%{_datadir}/%{name}/conf.d/plugins/python.conf -%{_mandir}/man5/abrt-python.conf.5* -%config(noreplace) %{_sysconfdir}/libreport/events.d/python_event.conf -%{_journalcatalogdir}/abrt_python.catalog -%config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python_format.conf -%{_mandir}/man5/python_event.conf.5* -%{python2_sitearch}/abrt.pth -%{python2_sitearch}/abrt_exception_handler.* - -%files -n python2-abrt-container-addon -%{python2_sitearch}/abrt_container.pth -%{python2_sitearch}/abrt_exception_handler_container.* -%endif # with python2 - %if %{with python3} %files -n python3-abrt-addon %config(noreplace) %{_sysconfdir}/%{name}/plugins/python3.conf -%{_datadir}/%{name}/conf.d/plugins/python3.conf -%{_mandir}/man5/abrt-python3.conf.5* +%{_mandir}/man5/python3-abrt.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/python3_event.conf -%{_journalcatalogdir}/abrt_python3.catalog +%{_journalcatalogdir}/python3_abrt.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf %{_mandir}/man5/python3_event.conf.5* %{python3_sitearch}/abrt3.pth @@ -1164,7 +1008,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %files atomic %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp_Atomic.conf %{_unitdir}/abrt-coredump-helper.service -%{_datadir}/%{name}/conf.d/plugins/CCpp_Atomic.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf %{_bindir}/abrt-action-save-package-data %{_mandir}/man1/abrt-action-save-package-data.1* @@ -1195,9 +1038,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.abrt.xml %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ccpp.xml %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.oops.xml -%if %{with python2} -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python.xml -%endif # with python2 %if %{with python3} %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python3.xml %endif # with python3 @@ -1212,19 +1052,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/*.css %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_dbus_event.conf -%if %{with python2} -%files -n python2-abrt -%{python2_sitearch}/problem/ -%{_mandir}/man5/abrt-python.5* - -%files -n python2-abrt-doc -%{python_sitelib}/problem_examples -%endif # with python2 - %if %{with python3} %files -n python3-abrt %{python3_sitearch}/problem/ -%{_mandir}/man5/abrt-python3.5* +%{_mandir}/man5/python3-abrt.5* %files -n python3-abrt-doc %{python3_sitelib}/problem_examples @@ -1234,6 +1065,47 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jul 03 2019 Martin Kutlak 2.12.1-1 +- Translation updates +- Rename all abrt-python to python3-abrt +- spec: Get rid of python provides +- hooks: abrt-hook-ccpp: Rename CreateCoreBacktrace setting +- Update icon +- non-fatal-mce: prepare oops1.test from template before using it +- meaningful-logs: check relative counts of lines instead of absolute +- oops-processing: fixed oops1.test handling. reworked so each oops has its own phase +- dumpoops: make sure hostname matches in oops_full_hostname.test +- Revert "applet: Add systemd service unit" +- a-a-analyze-c: Fix segfault when saving function name +- Fix grammar in implementation docs +- doc: Update man pages and mention locations of config files +- augeas,build,spec: Remove references to default configs +- daemon,lib: Update default config according to abrt.conf +- plugins: abrt-action-install-debuginfo: Replace uses of exit() +- plugins: abrt-action-install-debuginfo: Catch BrokenPipeError +- plugins: abrt-action-install-debuginfo: Remove unused imports +- daemon: Check return value after reading from channel +- spec: Require dbus-tools +- daemon: Don't process crashes from unpackaged apps by default +- plugins: abrt-action-install-debuginfo: Remove duplicate code +- plugins: abrt-action-install-debuginfo: Remove variable +- plugins: abrt-action-install-debuginfo: Remove comment +- plugins: abrt-action-install-debuginfo: Remove dead assignment +- doc: Fix spelling mistake in path to cache +- doc: Update man page for abrt-handle-upload +- doc: Update man page and help for a-a-install-debuginfo +- Nuke Python 2 support +- plugins: Catch unhandled exception in a-a-g-machine-id +- plugins: retrace-client: Bail out if we can’t get a config +- plugins: retrace-client: Default to HTTPS in RETRACE_SERVER_URI +- plugins: analyze_RetraceServer: Fix default RETRACE_SERVER_URI +- plugins: Fix name of env variable for retrace server +- configure.ac: Add dependency on libcap +- dbus: entry: Don’t claim truncation when there was none +- applet: Add systemd service unit +- spec: Remove obsolete scriptlets +- Makefile.am: Use correct locale when getting date + * Tue Feb 5 2019 Ernestas Kulik - 2.12.0-2 - Bump glib and libreport dependencies diff --git a/sources b/sources index 9217d6b..7f2ac7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.12.0.tar.gz) = 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded +SHA512 (abrt-2.12.1.tar.gz) = e5a8ceed76c152523932bfa626e20ce110ecd7d1c87b421ef99986c4782f537b1e4af6d93d73abca7187a7d67592a4b820bd3bcc93f02bc7ee025054eacb5738 From 482550b5e473a8a4cd61e6dea577e9f5fcc29a9e Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Thu, 1 Aug 2019 14:13:10 +0200 Subject: [PATCH 02/10] Update to 2.12.2 Signed-off-by: Ernestas Kulik --- .gitignore | 1 + abrt.spec | 35 ++++++++++++++++------------------- sources | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 740a5ff..2b791ec 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ abrt-1.1.13.tar.gz /abrt-2.11.1.tar.gz /abrt-2.12.0.tar.gz /abrt-2.12.1.tar.gz +/abrt-2.12.2.tar.gz diff --git a/abrt.spec b/abrt.spec index 2c1616f..5b1e831 100644 --- a/abrt.spec +++ b/abrt.spec @@ -45,7 +45,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.12.1 +Version: 2.12.2 Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ @@ -332,28 +332,21 @@ Requires: %{name} = %{version}-%{release} Requires: libreport-cli >= %{libreport_ver} Requires: abrt-libs = %{version}-%{release} Requires: abrt-dbus - -%description tui -This package contains a simple command line client for processing abrt reports -in command line environment. - %if %{with python3} -%package cli-ng -Summary: %{name}'s improved command line interface -Requires: %{name} = %{version}-%{release} -Requires: libreport-cli >= %{libreport_ver} -Requires: abrt-libs = %{version}-%{release} -Requires: abrt-dbus Requires: python3-abrt Requires: abrt-addon-ccpp Requires: python3-argh Requires: python3-argcomplete Requires: python3-humanize -%description cli-ng -New generation command line interface for ABRT +Provides: %{name}-cli-ng = %{version}-%{release} +Obsoletes: %{name}-cli-ng < 2.12.2 %endif # with python3 +%description tui +This package contains a simple command line client for processing abrt reports +in command line environment. + %package cli Summary: Virtual package to make easy default installation on non-graphical environments Requires: %{name} = %{version}-%{release} @@ -508,7 +501,6 @@ intltoolize --automake -c -f --without-atomic \ %endif %if 0%{?rhel} - --enable-suggest-autoreporting \ --enable-authenticated-autoreporting \ %endif %ifnarch %{arm} @@ -551,6 +543,10 @@ desktop-file-install \ src/applet/org.freedesktop.problems.applet.desktop ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ +%if %{with python3} +ln -sf %{_bindir}/abrt %{buildroot}%{_bindir}/abrt-cli +ln -sf %{_mandir}/man1/abrt.1 %{buildroot}%{_mandir}/man1/abrt-cli.1 +%endif # After everything is installed, remove info dir rm -f %{buildroot}%{_infodir}/dir @@ -991,15 +987,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %files cli %files tui -%{_bindir}/abrt-cli -%{_mandir}/man1/abrt-cli.1* - %if %{with python3} -%files cli-ng %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion %{_bindir}/abrt +%{_bindir}/abrt-cli %{python3_sitearch}/abrtcli/ %{_mandir}/man1/abrt.1* +%{_mandir}/man1/abrt-cli.1* %endif # with python3 %files desktop @@ -1065,6 +1059,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Aug 01 2019 Ernestas Kulik 2.12.2-1 +- Remove old CLI and move cli-ng subpackage files into tui subpackage + * Wed Jul 03 2019 Martin Kutlak 2.12.1-1 - Translation updates - Rename all abrt-python to python3-abrt diff --git a/sources b/sources index 7f2ac7a..8be0927 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.12.1.tar.gz) = e5a8ceed76c152523932bfa626e20ce110ecd7d1c87b421ef99986c4782f537b1e4af6d93d73abca7187a7d67592a4b820bd3bcc93f02bc7ee025054eacb5738 +SHA512 (abrt-2.12.2.tar.gz) = 8a6c1d718cce43a94de1d397d8a6bc9c24bb100081c9e4d4e9fb0441356991e3e8d7da066212ebbee8774e3a416c0e41e17713ced5ffb0c1f63588527e7dc983 From a80a28786374920a69442ae712a68e09e0241584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Fri, 11 Oct 2019 16:32:47 +0200 Subject: [PATCH 03/10] New upstream release 2.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matěj Grabovský --- .gitignore | 1 + abrt.spec | 178 ++++++++++++++++++++++++++--------------------------- sources | 2 +- 3 files changed, 88 insertions(+), 93 deletions(-) diff --git a/.gitignore b/.gitignore index 2b791ec..6268042 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ abrt-1.1.13.tar.gz /abrt-2.12.0.tar.gz /abrt-2.12.1.tar.gz /abrt-2.12.2.tar.gz +/abrt-2.13.0.tar.gz diff --git a/abrt.spec b/abrt.spec index 5b1e831..e05a29f 100644 --- a/abrt.spec +++ b/abrt.spec @@ -18,6 +18,9 @@ # build abrt-atomic subpackage %bcond_without atomic +# build abrt-retrace-client by default +%bcond_without retrace + # rpmbuild --define 'desktopvendor mystring' %if "x%{desktopvendor}" == "x" %define desktopvendor %(source /etc/os-release; echo ${ID}) @@ -45,7 +48,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.12.2 +Version: 2.13.0 Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ @@ -74,9 +77,6 @@ BuildRequires: libselinux-devel BuildRequires: python3-devel BuildRequires: python3-systemd BuildRequires: python3-argcomplete -BuildRequires: python3-argh -BuildRequires: python3-humanize -BuildRequires: python3-devel %endif # with python3 Requires: libreport >= %{libreport_ver} @@ -182,28 +182,23 @@ Requires: abrt-gui-libs = %{version}-%{release} %description gui GTK+ wizard for convenient bug reporting. -%package addon-coredump-helper -Summary: %{name}'s /proc/sys/kernel/core_pattern helper -Requires: abrt-libs = %{version}-%{release} - -%description addon-coredump-helper -This package contains hook for C/C++ crashed programs. - %package addon-ccpp Summary: %{name}'s C/C++ addon Requires: cpio Requires: gdb-headless Requires: elfutils %if 0%{!?rhel:1} +%if %{with retrace} # abrt-action-perform-ccpp-analysis wants to run analyze_RetraceServer: Requires: %{name}-retrace-client %endif +%endif Requires: %{name} = %{version}-%{release} -Requires: %{name}-addon-coredump-helper = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} %if %{with python3} Requires: python3-libreport %endif # with python3 +Obsoletes: abrt-addon-coredump-helper <= 2.12.2 %description addon-ccpp @@ -217,6 +212,7 @@ Requires: abrt-libs = %{version}-%{release} %description addon-upload-watch This package contains hook for uploaded problems. +%if %{with retrace} %package retrace-client Summary: %{name}'s retrace client Requires: %{name} = %{version}-%{release} @@ -228,6 +224,7 @@ Requires: libsoup %description retrace-client This package contains the client application for Retrace server which is able to analyze C/C++ crashes remotely. +%endif %package addon-kerneloops Summary: %{name}'s kerneloops addon @@ -291,6 +288,7 @@ Search for a new updates in bodhi server. %if %{with python3} %package -n python3-abrt-addon Summary: %{name}'s addon for catching and analyzing Python 3 exceptions +BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: python3-systemd Requires: python3-abrt @@ -335,9 +333,7 @@ Requires: abrt-dbus %if %{with python3} Requires: python3-abrt Requires: abrt-addon-ccpp -Requires: python3-argh Requires: python3-argcomplete -Requires: python3-humanize Provides: %{name}-cli-ng = %{version}-%{release} Obsoletes: %{name}-cli-ng < 2.12.2 @@ -363,7 +359,9 @@ Requires: abrt-addon-xorg Requires: libreport-rhel >= %{libreport_ver} Requires: libreport-plugin-rhtsupport >= %{libreport_ver} %else +%if %{with retrace} Requires: abrt-retrace-client +%endif %if %{with bodhi} Requires: abrt-plugin-bodhi %endif @@ -404,7 +402,9 @@ Requires: gnome-abrt Requires: libreport-rhel >= %{libreport_ver} Requires: libreport-plugin-rhtsupport >= %{libreport_ver} %else +%if %{with retrace} Requires: abrt-retrace-client +%endif %if %{with bodhi} Requires: abrt-plugin-bodhi %endif @@ -427,7 +427,6 @@ environment. %if %{with atomic} %package atomic Summary: Package to make easy default installation on Atomic hosts. -Requires: %{name}-addon-coredump-helper = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} Conflicts: %{name}-addon-ccpp @@ -485,12 +484,11 @@ to the shell %build -%define var_base_dir spool +autoconf -autoreconf -if -intltoolize --automake -c -f +%define default_dump_dir %{_localstatedir}/spool/abrt -%configure \ +CFLAGS="%{optflags} -Werror" %configure \ %if %{without python3} --without-python3 \ %endif # with python3 @@ -500,25 +498,27 @@ intltoolize --automake -c -f %if %{without atomic} --without-atomic \ %endif +%if %{without retrace} + --without-retrace \ +%endif %if 0%{?rhel} --enable-authenticated-autoreporting \ %endif %ifnarch %{arm} --enable-native-unwinder \ %endif - --with-defaultdumplocation=/var/%{var_base_dir}/abrt \ + --with-defaultdumplocation=%{default_dump_dir} \ --enable-doxygen-docs \ --enable-dump-time-unwind \ --disable-silent-rules -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT \ +%make_install \ %if %{with python3} PYTHON=%{__python3} \ %endif # with python3 - mandir=%{_mandir} \ dbusabrtdocdir=%{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/ %find_lang %{name} @@ -528,21 +528,21 @@ make install DESTDIR=$RPM_BUILD_ROOT \ # for those which needs to be byte-compiled with different # version (python2/python3). # rpm can do this work and use the appropriate python version. -find $RPM_BUILD_ROOT -name "*.py[co]" -delete +find %{buildroot} -name "*.py[co]" -delete # remove all .la and .a files -find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f -mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-di -mkdir -p $RPM_BUILD_ROOT/var/run/abrt -mkdir -p $RPM_BUILD_ROOT/var/%{var_base_dir}/abrt -mkdir -p $RPM_BUILD_ROOT/var/spool/abrt-upload -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/abrt +find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f +mkdir -p %{buildroot}%{_localstatedir}/cache/abrt-di +mkdir -p %{buildroot}%{_localstatedir}/lib/abrt +mkdir -p %{buildroot}%{_localstatedir}/run/abrt +mkdir -p %{buildroot}%{_localstatedir}/spool/abrt-upload +mkdir -p %{buildroot}%{default_dump_dir} desktop-file-install \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ src/applet/org.freedesktop.problems.applet.desktop -ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ +ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/ %if %{with python3} ln -sf %{_bindir}/abrt %{buildroot}%{_bindir}/abrt-cli ln -sf %{_mandir}/man1/abrt.1 %{buildroot}%{_mandir}/man1/abrt-cli.1 @@ -575,7 +575,6 @@ exit 0 # because /cache/abrt-di/* was created under root with root:root # so 2.x fails when it tries to extract debuginfo there.. chown -R abrt:abrt %{_localstatedir}/cache/abrt-di -%systemd_post abrt-ccpp.service %systemd_post abrt-journal-core.service %journal_catalog_update @@ -655,8 +654,6 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : if [ -f /etc/abrt/plugins/CCpp.conf ]; then mv /etc/abrt/plugins/CCpp.conf /etc/abrt/plugins/CCpp.conf.rpmsave.atomic || exit 1; fi -ln -sf /etc/abrt/plugins/CCpp_Atomic.conf /etc/abrt/plugins/CCpp.conf -%systemd_post abrt-coredump-helper.service %preun atomic if [ -L /etc/abrt/plugins/CCpp.conf ]; then @@ -665,9 +662,6 @@ fi if [ -f /etc/abrt/plugins/CCpp.conf.rpmsave.atomic ]; then mv /etc/abrt/plugins/CCpp.conf.rpmsave.atomic /etc/abrt/plugins/CCpp.conf || exit 1 fi - -%postun atomic -%systemd_postun_with_restart abrt-coredump-helper.service %endif # with atomic %if 0%{?rhel} && 0%{?rhel} <= 7 @@ -691,29 +685,11 @@ fi service abrtd condrestart >/dev/null 2>&1 || : %posttrans addon-ccpp -# Migrate from abrt-ccpp.service to abrt-journal-core.service -# 'systemctl preset abrt-ccpp.service abrt-journal-core.service' -# is done only for installation by %systemd_post macro but not for package -# upgrade. Following lines affect changes in Fedora preset files in case of -# package upgrade and also starts abrt-journal-core.service and stops -# abrt-ccpp.service if abrt-ccpp.service is running. -# All this has to be done only once because some users want to use -# abrt-ccpp.service instead of the default abrt-journal-core.service. -# Hence we introduced a %{_localstatedir}/lib/abrt/abrt-migrated file to -# mark the migration was done. -if test ! -f %{_localstatedir}/lib/abrt/abrt-migrated ; then - systemctl --no-reload preset abrt-ccpp.service >/dev/null 2>&1 || : - systemctl --no-reload preset abrt-journal-core.service >/dev/null 2>&1 || : - if service abrt-ccpp status >/dev/null 2>&1 ; then - systemctl stop abrt-ccpp >/dev/null 2>&1 || : - systemctl start abrt-journal-core >/dev/null 2>&1 || : - fi - touch %{_localstatedir}/lib/abrt/abrt-migrated +# Regenerate core_backtraces because of missing crash threads +abrtdir=$(grep "^\s*DumpLocation\b" /etc/abrt/abrt.conf | tail -1 | cut -d'=' -f2 | tr -d ' ') +if test -z "$abrtdir"; then + abrtdir=%{default_dump_dir} fi -systemctl try-restart abrt-journal-core >/dev/null 2>&1 || : -systemctl try-restart abrt-ccpp >/dev/null 2>&1 || : -# Regenerate core_bactraces because of missing crash threads -abrtdir=$(grep "DumpLocation" /etc/abrt/abrt.conf | cut -d'=' -f2 | tr -d ' ') if test -d "$abrtdir"; then for DD in `find "$abrtdir" -mindepth 1 -maxdepth 1 -type d` do @@ -764,16 +740,14 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_bindir}/abrt-action-analyze-python %{_bindir}/abrt-action-analyze-xorg %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.problems.daemon.conf +%config(noreplace) %{_sysconfdir}/%{name}/abrt.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf -%config(noreplace) %{_sysconfdir}/%{name}/plugins/xorg.conf -%{_mandir}/man5/abrt-xorg.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys.conf -%{_mandir}/man5/gpg_keys.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_event.conf %{_mandir}/man5/abrt_event.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/smart_event.conf %{_mandir}/man5/smart_event.conf.5* -%dir %attr(0751, root, abrt) %{_localstatedir}/%{var_base_dir}/%{name} +%dir %attr(0751, root, abrt) %{default_dump_dir} %dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload # abrtd runs as root %dir %attr(0755, root, root) %{_localstatedir}/run/%{name} @@ -787,16 +761,16 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-action-analyze-python.1* %{_mandir}/man1/abrt-action-analyze-xorg.1* %{_mandir}/man1/abrt-auto-reporting.1* -%{_mandir}/man8/abrtd.8* +%{_mandir}/man5/abrt.conf.5* %{_mandir}/man5/abrt-action-save-package-data.conf.5* -# {_mandir}/man5/pyhook.conf.5* +%{_mandir}/man5/gpg_keys.conf.5* +%{_mandir}/man8/abrtd.8* %files libs %{_libdir}/libabrt.so.* -%config(noreplace) %{_sysconfdir}/%{name}/abrt.conf -%{_mandir}/man5/abrt.conf.5* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins +%dir %{_datadir}/%{name} # filesystem package should own /usr/share/augeas/lenses directory %{_datadir}/augeas/lenses/abrt.aug @@ -834,19 +808,12 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-applet.1* %{_mandir}/man1/system-config-abrt.1* -%files addon-coredump-helper -%{_libexecdir}/abrt-hook-ccpp -%{_sbindir}/abrt-install-ccpp-hook - %files addon-ccpp %dir %attr(0775, abrt, abrt) %{_localstatedir}/cache/abrt-di %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf %{_mandir}/man5/abrt-CCpp.conf.5* %{_libexecdir}/abrt-gdb-exploitable -%{_journalcatalogdir}/abrt_ccpp.catalog -%config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_ccpp_format.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_journal_ccpp_format.conf -%{_unitdir}/abrt-ccpp.service %{_unitdir}/abrt-journal-core.service %dir %{_localstatedir}/lib/abrt @@ -874,6 +841,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man5/vimrc_event.conf.5* %{_datadir}/libreport/events/analyze_CCpp.xml %{_datadir}/libreport/events/analyze_LocalGDB.xml +%{_datadir}/libreport/events/analyze_RetraceServer.xml %{_datadir}/libreport/events/collect_xsession_errors.xml %{_datadir}/libreport/events/collect_GConf.xml %{_datadir}/libreport/events/collect_vimrc_user.xml @@ -885,7 +853,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man*/abrt-action-generate-core-backtrace.* %{_mandir}/man*/abrt-action-analyze-backtrace.* %{_mandir}/man*/abrt-action-list-dsos.* -%{_mandir}/man*/abrt-install-ccpp-hook.* %{_mandir}/man*/abrt-action-install-debuginfo.* %{_mandir}/man*/abrt-action-analyze-ccpp-local.* %{_mandir}/man*/abrt-action-analyze-core.* @@ -899,12 +866,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man*/abrt-upload-watch.* +%if %{with retrace} %files retrace-client %{_bindir}/abrt-retrace-client %{_mandir}/man1/abrt-retrace-client.1* %config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf %{_mandir}/man5/ccpp_retrace_event.conf.5* -%{_datadir}/libreport/events/analyze_RetraceServer.xml +%endif %files addon-kerneloops %config(noreplace) %{_sysconfdir}/libreport/events.d/koops_event.conf @@ -928,12 +896,14 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/libreport/events.d/xorg_event.conf %{_journalcatalogdir}/abrt_xorg.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_xorg_format.conf -%{_mandir}/man5/xorg_event.conf.5* +%config(noreplace) %{_sysconfdir}/%{name}/plugins/xorg.conf %{_unitdir}/abrt-xorg.service %{_bindir}/abrt-dump-xorg %{_bindir}/abrt-dump-journal-xorg %{_mandir}/man1/abrt-dump-xorg.1* %{_mandir}/man1/abrt-dump-journal-xorg.1* +%{_mandir}/man5/abrt-xorg.conf.5* +%{_mandir}/man5/xorg_event.conf.5* %files addon-vmcore %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf @@ -1000,8 +970,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %if %{with atomic} %files atomic -%config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp_Atomic.conf -%{_unitdir}/abrt-coredump-helper.service %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf %{_bindir}/abrt-action-save-package-data %{_mandir}/man1/abrt-action-save-package-data.1* @@ -1020,25 +988,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %files dbus %{_sbindir}/abrt-dbus -%{_sbindir}/abrt-configuration %{_mandir}/man8/abrt-dbus.8* -%{_mandir}/man8/abrt-configuration.8* %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-abrt.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Entry.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Session.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Task.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.abrt.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ccpp.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.oops.xml -%if %{with python3} -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python3.xml -%endif # with python3 -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.vmcore.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.xorg.xml %{_datadir}/dbus-1/system-services/org.freedesktop.problems.service -%{_datadir}/dbus-1/system-services/com.redhat.problems.configuration.service %{_datadir}/polkit-1/actions/abrt_polkit.policy %dir %{_defaultdocdir}/%{name}-dbus%{docdirversion}/ %dir %{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/ @@ -1059,6 +1015,44 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Oct 11 2019 Matěj Grabovský 2.13.0-1 +- cli: Use format argument in info command +- cli: Make pretty and format mutually exclusive +- cli: Set PYTHONPATH for tests +- cli: Rework commands +- Remove abrt-hook-ccpp +- spec: Use macros where appropriate +- tests: Use Augeas consistently +- spec: Move config files to corresponding subpackages +- build,spec: Empty config files in /etc/abrt/ +- doc: Update man pages and comments in config files +- plugins: Update in-code defaults +- doc: Correct alignment of heading underlines +- a-dump-journal-core: Purge commented code +- dbus: Remove D-Bus configuration service +- Partly revert removal of default configs +- cli: Tweak problem matching +- plugins: Add satyr flags when building +- cli: Fix warning +- cli: Fix file name +- cli: Use decorator for MATCH positional argument +- cli: match: Iterate dict instead of calling keys() +- cli: Make pylint happier about imports +- cli: Drop unused variables +- cli: utils: Use consistent return +- cli: Improve i18n +- cli: Drop humanize import +- Drop uses of bind_textdomain_codeset() +- gitignore: Update path to generated file after cli-ng move +- tests: runner: Use systemctl instead of service +- autogen.sh: Use autoreconf + +* Thu Oct 03 2019 Miro Hrončok - 2.12.2-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Sat Aug 17 2019 Miro Hrončok - 2.12.2-2 +- Rebuilt for Python 3.8 + * Thu Aug 01 2019 Ernestas Kulik 2.12.2-1 - Remove old CLI and move cli-ng subpackage files into tui subpackage diff --git a/sources b/sources index 8be0927..76c1515 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.12.2.tar.gz) = 8a6c1d718cce43a94de1d397d8a6bc9c24bb100081c9e4d4e9fb0441356991e3e8d7da066212ebbee8774e3a416c0e41e17713ced5ffb0c1f63588527e7dc983 +SHA512 (abrt-2.13.0.tar.gz) = 936c83293dcb71051b8dd89e84718cf0f76c7d7998b414a2c41d43b8e2a4dc6718f42d8fd47186bd15bac3ea06081f411ab3a7ed3729343da9e6e91edb046568 From 9a6f16d7b66a863edf238ab3bf7129ed7b284796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Wed, 16 Oct 2019 14:02:50 +0200 Subject: [PATCH 04/10] Use correct paths for installed Python modules This patch is pulled from upstream. --- ...-correct-paths-for-installed-modules.patch | 96 +++++++++++++++++++ abrt.spec | 18 ++-- 2 files changed, 107 insertions(+), 7 deletions(-) create mode 100644 0001-python-Use-correct-paths-for-installed-modules.patch diff --git a/0001-python-Use-correct-paths-for-installed-modules.patch b/0001-python-Use-correct-paths-for-installed-modules.patch new file mode 100644 index 0000000..d12bb22 --- /dev/null +++ b/0001-python-Use-correct-paths-for-installed-modules.patch @@ -0,0 +1,96 @@ +From 57c0042ead87249bed5964eeec45b97543674060 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Wed, 16 Oct 2019 11:27:54 +0200 +Subject: [PATCH] python: Use correct paths for installed modules + +Non-compiled (without C bits) Python modules should be installed into +architecture-independent directory (/usr/lib/python3.x/site-packages +in the case of Fedora). + +This commit fixes both +* the spec file, where %{python3_sitelib} should be used rather than + %{python3_sitearch} which is to be used for compiled extensions; and +* the automake scripts, where $(pythondir) should be used in place of + $(pyexecdir) for the same reason. + +This is a follow-up to 20dcf7fb4. +--- + abrt.spec.in | 14 +++++++------- + src/cli/abrtcli/Makefile.am | 2 +- + src/cli/abrtcli/cli/Makefile.am | 2 +- + src/hooks/Makefile.am | 2 +- + 4 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/abrt.spec.in b/abrt.spec.in +index 1c6c48ad..fe0b2278 100644 +--- a/abrt.spec.in ++++ b/abrt.spec.in +@@ -935,14 +935,14 @@ killall abrt-dbus >/dev/null 2>&1 || : + %{_journalcatalogdir}/python3_abrt.catalog + %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf + %{_mandir}/man5/python3_event.conf.5* +-%{python3_sitearch}/abrt3.pth +-%{python3_sitearch}/abrt_exception_handler3.py +-%{python3_sitearch}/__pycache__/abrt_exception_handler3.* ++%{python3_sitelib}/abrt3.pth ++%{python3_sitelib}/abrt_exception_handler3.py ++%{python3_sitelib}/__pycache__/abrt_exception_handler3.* + + %files -n python3-abrt-container-addon +-%{python3_sitearch}/abrt3_container.pth +-%{python3_sitearch}/abrt_exception_handler3_container.py +-%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.* ++%{python3_sitelib}/abrt3_container.pth ++%{python3_sitelib}/abrt_exception_handler3_container.py ++%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* + %endif # with python3 + + %files plugin-sosreport +@@ -959,7 +959,7 @@ killall abrt-dbus >/dev/null 2>&1 || : + %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion + %{_bindir}/abrt + %{_bindir}/abrt-cli +-%{python3_sitearch}/abrtcli/ ++%{python3_sitelib}/abrtcli/ + %{_mandir}/man1/abrt.1* + %{_mandir}/man1/abrt-cli.1* + %endif # with python3 +diff --git a/src/cli/abrtcli/Makefile.am b/src/cli/abrtcli/Makefile.am +index d11355a2..a599d0b5 100644 +--- a/src/cli/abrtcli/Makefile.am ++++ b/src/cli/abrtcli/Makefile.am +@@ -9,7 +9,7 @@ PYFILES= \ + utils.py + + abrtcli_PYTHON = $(PYFILES) +-abrtclidir = $(pyexecdir)/abrtcli ++abrtclidir = $(pythondir)/abrtcli + + config.py: config.py.in + sed -e s,\@LOCALE_DIR\@,$(localedir),g \ +diff --git a/src/cli/abrtcli/cli/Makefile.am b/src/cli/abrtcli/cli/Makefile.am +index 17ff216b..c796074d 100644 +--- a/src/cli/abrtcli/cli/Makefile.am ++++ b/src/cli/abrtcli/cli/Makefile.am +@@ -10,4 +10,4 @@ abrtclicommands_PYTHON = \ + retrace.py \ + status.py + +-abrtclicommandsdir = $(pyexecdir)/abrtcli/cli ++abrtclicommandsdir = $(pythondir)/abrtcli/cli +diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am +index 6e35887f..bdef0329 100644 +--- a/src/hooks/Makefile.am ++++ b/src/hooks/Makefile.am +@@ -35,7 +35,7 @@ EXTRA_DIST = \ + ALL_DEPENDENCES = + + if BUILD_PYTHON3 +-py3hookdir = $(pyexecdir) ++py3hookdir = $(pythondir) + dist_pluginsconf_DATA += python3.conf + ALL_DEPENDENCES += abrt_exception_handler3.py + +-- +2.21.0 + diff --git a/abrt.spec b/abrt.spec index e05a29f..0aba2b4 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,6 +53,10 @@ Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz + +Patch0: 0001-python-Use-correct-paths-for-installed-modules.patch + +BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel @@ -937,14 +941,14 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_journalcatalogdir}/python3_abrt.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf %{_mandir}/man5/python3_event.conf.5* -%{python3_sitearch}/abrt3.pth -%{python3_sitearch}/abrt_exception_handler3.py -%{python3_sitearch}/__pycache__/abrt_exception_handler3.* +%{python3_sitelib}/abrt3.pth +%{python3_sitelib}/abrt_exception_handler3.py +%{python3_sitelib}/__pycache__/abrt_exception_handler3.* %files -n python3-abrt-container-addon -%{python3_sitearch}/abrt3_container.pth -%{python3_sitearch}/abrt_exception_handler3_container.py -%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.* +%{python3_sitelib}/abrt3_container.pth +%{python3_sitelib}/abrt_exception_handler3_container.py +%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* %endif # with python3 %files plugin-sosreport @@ -961,7 +965,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion %{_bindir}/abrt %{_bindir}/abrt-cli -%{python3_sitearch}/abrtcli/ +%{python3_sitelib}/abrtcli/ %{_mandir}/man1/abrt.1* %{_mandir}/man1/abrt-cli.1* %endif # with python3 From a7e4367621cb50cde184784b0321e4217c8b4b13 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Tue, 14 Jan 2020 13:58:06 +0100 Subject: [PATCH 05/10] Drop scriptlets for abrt-ccpp.service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s been dropped, no use in triggering disabling or restarting. The preset has had abrt-ccpp replaced with abrt-journal-core forever now as well, so let’s just do it. --- abrt.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/abrt.spec b/abrt.spec index 0aba2b4..649869d 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.13.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -609,7 +609,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 @@ -631,7 +630,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 @@ -1019,6 +1017,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Jan 14 2020 - Ernestas Kulik - 2.13.0-2 +- Drop systemd scriptlets for abrt-ccpp.service + * Fri Oct 11 2019 Matěj Grabovský 2.13.0-1 - cli: Use format argument in info command - cli: Make pretty and format mutually exclusive From 64bac3f99f5c894d0668f4f1c855ef9f410ad1dc Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Fri, 7 Feb 2020 08:45:18 +0100 Subject: [PATCH 06/10] Update to 2.14.0 --- .gitignore | 1 + ...-correct-paths-for-installed-modules.patch | 96 ------------------- abrt.spec | 14 +-- sources | 2 +- 4 files changed, 10 insertions(+), 103 deletions(-) delete mode 100644 0001-python-Use-correct-paths-for-installed-modules.patch diff --git a/.gitignore b/.gitignore index 6268042..41d1ef0 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ abrt-1.1.13.tar.gz /abrt-2.12.1.tar.gz /abrt-2.12.2.tar.gz /abrt-2.13.0.tar.gz +/abrt-2.14.0.tar.gz diff --git a/0001-python-Use-correct-paths-for-installed-modules.patch b/0001-python-Use-correct-paths-for-installed-modules.patch deleted file mode 100644 index d12bb22..0000000 --- a/0001-python-Use-correct-paths-for-installed-modules.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 57c0042ead87249bed5964eeec45b97543674060 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= -Date: Wed, 16 Oct 2019 11:27:54 +0200 -Subject: [PATCH] python: Use correct paths for installed modules - -Non-compiled (without C bits) Python modules should be installed into -architecture-independent directory (/usr/lib/python3.x/site-packages -in the case of Fedora). - -This commit fixes both -* the spec file, where %{python3_sitelib} should be used rather than - %{python3_sitearch} which is to be used for compiled extensions; and -* the automake scripts, where $(pythondir) should be used in place of - $(pyexecdir) for the same reason. - -This is a follow-up to 20dcf7fb4. ---- - abrt.spec.in | 14 +++++++------- - src/cli/abrtcli/Makefile.am | 2 +- - src/cli/abrtcli/cli/Makefile.am | 2 +- - src/hooks/Makefile.am | 2 +- - 4 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/abrt.spec.in b/abrt.spec.in -index 1c6c48ad..fe0b2278 100644 ---- a/abrt.spec.in -+++ b/abrt.spec.in -@@ -935,14 +935,14 @@ killall abrt-dbus >/dev/null 2>&1 || : - %{_journalcatalogdir}/python3_abrt.catalog - %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf - %{_mandir}/man5/python3_event.conf.5* --%{python3_sitearch}/abrt3.pth --%{python3_sitearch}/abrt_exception_handler3.py --%{python3_sitearch}/__pycache__/abrt_exception_handler3.* -+%{python3_sitelib}/abrt3.pth -+%{python3_sitelib}/abrt_exception_handler3.py -+%{python3_sitelib}/__pycache__/abrt_exception_handler3.* - - %files -n python3-abrt-container-addon --%{python3_sitearch}/abrt3_container.pth --%{python3_sitearch}/abrt_exception_handler3_container.py --%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.* -+%{python3_sitelib}/abrt3_container.pth -+%{python3_sitelib}/abrt_exception_handler3_container.py -+%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* - %endif # with python3 - - %files plugin-sosreport -@@ -959,7 +959,7 @@ killall abrt-dbus >/dev/null 2>&1 || : - %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion - %{_bindir}/abrt - %{_bindir}/abrt-cli --%{python3_sitearch}/abrtcli/ -+%{python3_sitelib}/abrtcli/ - %{_mandir}/man1/abrt.1* - %{_mandir}/man1/abrt-cli.1* - %endif # with python3 -diff --git a/src/cli/abrtcli/Makefile.am b/src/cli/abrtcli/Makefile.am -index d11355a2..a599d0b5 100644 ---- a/src/cli/abrtcli/Makefile.am -+++ b/src/cli/abrtcli/Makefile.am -@@ -9,7 +9,7 @@ PYFILES= \ - utils.py - - abrtcli_PYTHON = $(PYFILES) --abrtclidir = $(pyexecdir)/abrtcli -+abrtclidir = $(pythondir)/abrtcli - - config.py: config.py.in - sed -e s,\@LOCALE_DIR\@,$(localedir),g \ -diff --git a/src/cli/abrtcli/cli/Makefile.am b/src/cli/abrtcli/cli/Makefile.am -index 17ff216b..c796074d 100644 ---- a/src/cli/abrtcli/cli/Makefile.am -+++ b/src/cli/abrtcli/cli/Makefile.am -@@ -10,4 +10,4 @@ abrtclicommands_PYTHON = \ - retrace.py \ - status.py - --abrtclicommandsdir = $(pyexecdir)/abrtcli/cli -+abrtclicommandsdir = $(pythondir)/abrtcli/cli -diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am -index 6e35887f..bdef0329 100644 ---- a/src/hooks/Makefile.am -+++ b/src/hooks/Makefile.am -@@ -35,7 +35,7 @@ EXTRA_DIST = \ - ALL_DEPENDENCES = - - if BUILD_PYTHON3 --py3hookdir = $(pyexecdir) -+py3hookdir = $(pythondir) - dist_pluginsconf_DATA += python3.conf - ALL_DEPENDENCES += abrt_exception_handler3.py - --- -2.21.0 - diff --git a/abrt.spec b/abrt.spec index 649869d..0d715d0 100644 --- a/abrt.spec +++ b/abrt.spec @@ -43,19 +43,17 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.10.0 +%define libreport_ver 2.12.0 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.13.0 -Release: 2%{?dist} +Version: 2.14.0 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-python-Use-correct-paths-for-installed-modules.patch - BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname @@ -131,7 +129,7 @@ BuildRequires: gdb-headless BuildRequires: polkit-devel %if %{with python3} #python3-abrt -BuildRequires: python3-nose +BuildRequires: python3-pytest BuildRequires: python3-sphinx BuildRequires: python3-libreport #python3-abrt-doc @@ -817,6 +815,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_libexecdir}/abrt-gdb-exploitable %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_journal_ccpp_format.conf %{_unitdir}/abrt-journal-core.service +%{_journalcatalogdir}/abrt_ccpp.catalog %dir %{_localstatedir}/lib/abrt @@ -1017,6 +1016,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Feb 07 2020 Ernestas Kulik - 2.14.0-1 +- Update to 2.14.0 + * Tue Jan 14 2020 - Ernestas Kulik - 2.13.0-2 - Drop systemd scriptlets for abrt-ccpp.service diff --git a/sources b/sources index 76c1515..fe58d9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.13.0.tar.gz) = 936c83293dcb71051b8dd89e84718cf0f76c7d7998b414a2c41d43b8e2a4dc6718f42d8fd47186bd15bac3ea06081f411ab3a7ed3729343da9e6e91edb046568 +SHA512 (abrt-2.14.0.tar.gz) = 2d817b7761d5afdca00a825281b759bc084a17d7393fcdf87df1a901b5c1a75595e3a733e481b30b02d068a123f8eac26163e2e55366e7cc20266a95e863967e From 9a20884621c21b14eb83c6976ae16009e5d4ad8a Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Fri, 24 Apr 2020 18:02:50 +0200 Subject: [PATCH 07/10] New upstream release 2.14.1 Signed-off-by: Michal Fabik --- .gitignore | 1 + abrt.spec | 25 ++++++++++++++++++++++--- sources | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 41d1ef0..3af754d 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ abrt-1.1.13.tar.gz /abrt-2.12.2.tar.gz /abrt-2.13.0.tar.gz /abrt-2.14.0.tar.gz +/abrt-2.14.1.tar.gz diff --git a/abrt.spec b/abrt.spec index 0d715d0..bda26bb 100644 --- a/abrt.spec +++ b/abrt.spec @@ -48,7 +48,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.14.0 +Version: 2.14.1 Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ @@ -114,7 +114,6 @@ BuildRequires: libreport-gtk-devel >= %{libreport_ver} BuildRequires: gsettings-desktop-schemas-devel >= 3.15 #addon-ccpp BuildRequires: gdb-headless -BuildRequires: libcap-devel #addon-kerneloops BuildRequires: systemd-devel BuildRequires: %{libjson_devel} @@ -750,7 +749,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %dir %attr(0751, root, abrt) %{default_dump_dir} %dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload # abrtd runs as root -%dir %attr(0755, root, root) %{_localstatedir}/run/%{name} +%ghost %dir %attr(0755, root, root) %{_localstatedir}/run/%{name} %ghost %attr(0666, -, -) %{_localstatedir}/run/%{name}/abrt.socket %ghost %attr(0644, -, -) %{_localstatedir}/run/%{name}/abrtd.pid @@ -1016,6 +1015,26 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Apr 24 2020 Michal Fabik - 2.14.1-1 +- tests: Add perl, php R and tcl to dont-blame-interpret +- a-a-save-package-data: Add R and tcl to interpreted langs +- a-a-save-package-data: Use regexps to match interpreters +- .travis.yml: Update secret +- plugins: xorg-utils: Loopify parsing +- Add namespace to libreport function and global names +- cli: Correct debug directories in config +- cli: Show defaults in help output +- cli: Fix verbosity option +- cli: Fix descriptions for --since and --until +- autogen.sh: Handle NOCONFIGURE per the Build API +- plugins: journal: Fix ci_mapping being overwritten +- plugins: abrt-journal-core: Don’t assume anything about uid_t +- lib,plugins: Accomodate for multiple debug directories +- dbus: Drop bogus dependency +- dbus: Drop abrt_problems2 +- Drop libcap dependency +- Drop Travis config + * Fri Feb 07 2020 Ernestas Kulik - 2.14.0-1 - Update to 2.14.0 diff --git a/sources b/sources index fe58d9f..08f6991 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.14.0.tar.gz) = 2d817b7761d5afdca00a825281b759bc084a17d7393fcdf87df1a901b5c1a75595e3a733e481b30b02d068a123f8eac26163e2e55366e7cc20266a95e863967e +SHA512 (abrt-2.14.1.tar.gz) = 5486a4174e7db902f5a30c44159b3c0745341b1b4cb89df903cf42f9bf64ee2309708a20d8312760276db0171655972e9f2847e3463af0e34c66c4ea28cf2c6c From 4fae30b966f36bb8be6b82138b2f1455b65280bc Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Sat, 25 Apr 2020 11:12:34 +0200 Subject: [PATCH 08/10] Bump libreport dependency --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index bda26bb..f421045 100644 --- a/abrt.spec +++ b/abrt.spec @@ -43,7 +43,7 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.12.0 +%define libreport_ver 2.13.0 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool From de46fb422ff69d12840276fddfe258f93d71ccdb Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Tue, 12 May 2020 10:21:22 +0200 Subject: [PATCH 09/10] New upstream release 2.14.2 Signed-off-by: Michal Fabik --- .gitignore | 1 + abrt.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3af754d..16cc618 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ abrt-1.1.13.tar.gz /abrt-2.13.0.tar.gz /abrt-2.14.0.tar.gz /abrt-2.14.1.tar.gz +/abrt-2.14.2.tar.gz diff --git a/abrt.spec b/abrt.spec index f421045..ee3cb29 100644 --- a/abrt.spec +++ b/abrt.spec @@ -48,7 +48,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.14.1 +Version: 2.14.2 Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ @@ -1015,6 +1015,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue May 12 2020 Michal Fabik - 2.14.2-1 +- Fix broken builds with --enable-authenticated-autoreporting + * Fri Apr 24 2020 Michal Fabik - 2.14.1-1 - tests: Add perl, php R and tcl to dont-blame-interpret - a-a-save-package-data: Add R and tcl to interpreted langs diff --git a/sources b/sources index 08f6991..ad6df13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.14.1.tar.gz) = 5486a4174e7db902f5a30c44159b3c0745341b1b4cb89df903cf42f9bf64ee2309708a20d8312760276db0171655972e9f2847e3463af0e34c66c4ea28cf2c6c +SHA512 (abrt-2.14.2.tar.gz) = 020bd0550c41b2358a718a4f0f0c3a839d86fd46fc0c4f4cfc4b7d7f851baf2d5179e008ac1912b350f9f0fbfbfee94e422de3aadce5eb0f7f84a04f233349ff From 284f60e280e9713421687b72aaa33fe0812b90a8 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Thu, 21 May 2020 15:58:39 +0200 Subject: [PATCH 10/10] Add fix for #1836190 --- ...s-instance-pointer-to-signal-handler.patch | 28 +++++++++++++++++++ 0002-applet-Chain-up-in-dispose.patch | 26 +++++++++++++++++ abrt.spec | 8 +++++- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 0001-applet-Pass-instance-pointer-to-signal-handler.patch create mode 100644 0002-applet-Chain-up-in-dispose.patch diff --git a/0001-applet-Pass-instance-pointer-to-signal-handler.patch b/0001-applet-Pass-instance-pointer-to-signal-handler.patch new file mode 100644 index 0000000..9010657 --- /dev/null +++ b/0001-applet-Pass-instance-pointer-to-signal-handler.patch @@ -0,0 +1,28 @@ +From 5618985d3d7f830ebba0ef78e2ee6d3d6f9f6c55 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +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 + diff --git a/0002-applet-Chain-up-in-dispose.patch b/0002-applet-Chain-up-in-dispose.patch new file mode 100644 index 0000000..7d749e1 --- /dev/null +++ b/0002-applet-Chain-up-in-dispose.patch @@ -0,0 +1,26 @@ +From b08e7cbd26704b0a5400fdfab1f3f2e3922b102f Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +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 + diff --git a/abrt.spec b/abrt.spec index ee3cb29..c4fdbea 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,11 +49,14 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-applet-Pass-instance-pointer-to-signal-handler.patch +Patch1: 0002-applet-Chain-up-in-dispose.patch + BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname @@ -1015,6 +1018,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu May 21 2020 Ernestas Kulik - 2.14.2-2 +- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1836190 + * Tue May 12 2020 Michal Fabik - 2.14.2-1 - Fix broken builds with --enable-authenticated-autoreporting