From 2e900184c438bb0713ed515e5090f1e6bade632e Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ekulik@redhat.com>
Date: Aug 01 2019 12:13:10 +0000
Subject: Update to 2.12.2


Signed-off-by: Ernestas Kulik <ekulik@redhat.com>

---

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 54021a4..e369643 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/
@@ -334,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}
@@ -509,7 +502,6 @@ intltoolize --automake -c -f
         --without-atomic \
 %endif
 %if 0%{?rhel}
-        --enable-suggest-autoreporting \
         --enable-authenticated-autoreporting \
 %endif
 %ifnarch %{arm}
@@ -552,6 +544,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
@@ -1001,15 +997,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
@@ -1075,6 +1069,9 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
 
 %changelog
+* Thu Aug 01 2019 Ernestas Kulik <ekulik@redhat.com> 2.12.2-1
+- Remove old CLI and move cli-ng subpackage files into tui subpackage
+
 * Wed Jul 03 2019 Martin Kutlak <mkutlak@redhat.com> 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