From ac861159cab4f29355901516c41ac19d7ba4fd79 Mon Sep 17 00:00:00 2001
From: Matěj Grabovský <mgrabovs@redhat.com>
Date: Oct 11 2019 14:32:47 +0000
Subject: New upstream release 2.13.0


Signed-off-by: Matěj Grabovský <mgrabovs@redhat.com>

---

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 c098184..84963b2 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,8 +48,8 @@
 
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 2.12.2
-Release: 3%{?dist}
+Version: 2.13.0
+Release: 1%{?dist}
 License: GPLv2+
 URL: https://abrt.readthedocs.org/
 Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -76,9 +79,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}
@@ -184,28 +184,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
@@ -219,6 +214,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}
@@ -230,6 +226,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
@@ -293,6 +290,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
@@ -337,9 +335,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
@@ -365,7 +361,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
@@ -406,7 +404,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
@@ -429,7 +429,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
 
@@ -487,12 +486,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
@@ -502,25 +500,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}
@@ -530,21 +530,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
@@ -577,7 +577,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
 
@@ -657,8 +656,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
@@ -667,9 +664,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
@@ -693,29 +687,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
@@ -766,16 +742,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}
@@ -789,16 +763,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
@@ -836,19 +810,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
@@ -876,6 +843,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
@@ -887,7 +855,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.*
@@ -901,12 +868,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
@@ -930,12 +898,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
@@ -1002,8 +972,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*
@@ -1022,25 +990,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/
@@ -1061,6 +1017,38 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
 
 %changelog
+* Fri Oct 11 2019 Matěj Grabovský <mgrabovs@redhat.com> 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 <mhroncok@redhat.com> - 2.12.2-3
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 
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