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/0001-a-a-list-dsos-Add-check-for-decode-attribute.patch b/0001-a-a-list-dsos-Add-check-for-decode-attribute.patch deleted file mode 100644 index 4fac1dd..0000000 --- a/0001-a-a-list-dsos-Add-check-for-decode-attribute.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b7ce0f017fd5d98b7c641a2784e9b1c4c9dec834 Mon Sep 17 00:00:00 2001 -From: Martin Kutlak -Date: Fri, 12 Jul 2019 16:44:19 +0200 -Subject: [PATCH] a-a-list-dsos: Add check for decode attribute - -rpm used to return bytes but that was changed to return strings in recent release. - -The check for decode attribute keeps compatibility with older fedora releases. - -This can be removed in the future with rpm 4.15(?) - -Related: rhbz#1693751 -Resolves: rhbz#1694970 - -Signed-off-by: Martin Kutlak ---- - src/plugins/abrt-action-list-dsos | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos -index adb228a41..5d1240cb4 100644 ---- a/src/plugins/abrt-action-list-dsos -+++ b/src/plugins/abrt-action-list-dsos -@@ -84,15 +84,21 @@ if __name__ == "__main__": - outname = None - - vendor = h[rpm.RPMTAG_VENDOR] -- if vendor != None: -+ if vendor is not None and hasattr(vendor, 'decode'): - vendor = vendor.decode('utf-8') - -+ rpmtag_nevra = h[rpm.RPMTAG_NEVRA] -+ # FIXME change from bugzilla #1693751 -+ # can be removed with rpm 4.15 -+ if hasattr(rpmtag_nevra, 'decode'): -+ rpmtag_nevra = rpmtag_nevra.decode('utf-8') -+ - outfile.write("%s %s (%s) %s\n" % -- (path, -- h[rpm.RPMTAG_NEVRA].decode('utf-8'), -- vendor, -- h[rpm.RPMTAG_INSTALLTIME]) -- ) -+ (path, -+ rpmtag_nevra, -+ vendor, -+ h[rpm.RPMTAG_INSTALLTIME]) -+ ) - - except Exception as ex: - error_msg_and_die("Can't get the DSO list: %s" % ex) --- -2.21.0 - diff --git a/abrt.spec b/abrt.spec index 15153f1..4c8ad94 100644 --- a/abrt.spec +++ b/abrt.spec @@ -45,14 +45,12 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.12.1 -Release: 3%{?dist} +Version: 2.12.2 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0001: 0001-a-a-list-dsos-Add-check-for-decode-attribute.patch - BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname @@ -336,28 +334,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} @@ -512,7 +503,6 @@ intltoolize --automake -c -f --without-atomic \ %endif %if 0%{?rhel} - --enable-suggest-autoreporting \ --enable-authenticated-autoreporting \ %endif %ifnarch %{arm} @@ -555,6 +545,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 @@ -995,15 +989,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 @@ -1069,6 +1061,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 24 2019 Fedora Release Engineering - 2.12.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild 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