From 6b11b1ff26d98412601e7bdda4b4f44c89b85ed2 Mon Sep 17 00:00:00 2001
From: Martin Kutlak <mkutlak@redhat.com>
Date: Jul 03 2019 15:54:51 +0000
Subject: 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 <mkutlak@redhat.com>

---

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 3fe57ed..6b46536 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: 4%{?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
@@ -78,13 +71,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
@@ -110,11 +96,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
@@ -145,13 +126,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
@@ -230,10 +204,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
 
 
@@ -291,11 +261,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
 
@@ -324,41 +289,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
@@ -512,47 +448,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
@@ -561,11 +462,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
@@ -577,9 +473,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.
@@ -602,14 +495,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
@@ -703,11 +592,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
@@ -777,25 +661,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
@@ -896,12 +770,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*
@@ -928,13 +799,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
@@ -962,8 +829,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
@@ -981,7 +846,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
@@ -1053,7 +917,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
@@ -1081,7 +944,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
@@ -1102,30 +964,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
@@ -1165,7 +1009,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*
@@ -1196,9 +1039,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
@@ -1213,19 +1053,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
@@ -1235,6 +1066,47 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
 
 %changelog
+* Wed Jul 03 2019 Martin Kutlak <mkutlak@redhat.com> 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
+
 * Mon Jun 10 22:13:16 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.12.0-4
 - Rebuild for RPM 4.15
 
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