From a5ce1c980a2a9dc5f354c5624bf0a8042a58c7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E5=BF=97=E5=8D=8E?= Date: Fri, 20 Mar 2020 14:58:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!4=20:?= =?UTF-8?q?=20resolve=20install=20conflicts'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abrt.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/abrt.spec b/abrt.spec index 09cc8e1..02f8146 100644 --- a/abrt.spec +++ b/abrt.spec @@ -1,6 +1,6 @@ Name: abrt Version: 2.13.0 -Release: 5 +Release: 4 Summary: A tool for automatic bug detection and reporting License: GPLv2+ URL: https://abrt.readthedocs.org/ @@ -139,7 +139,7 @@ uncaught exception in python3 programs. %package -n python3-abrt-container-addon Summary: Container addon for catching Python3 exceptions for abrt -Conflicts: python3-abrt-addon < %{version}-%{release} +Conflicts: python3-abrt-addon Requires: container-exception-logger %description -n python3-abrt-container-addon @@ -200,7 +200,7 @@ environment. %package atomic Summary: Package to make easy default installation on Atomic hosts. Requires: %{name}-libs = %{version}-%{release} -Conflicts: %{name}-addon-ccpp < %{version}-%{release} +Conflicts: %{name}-addon-ccpp %description atomic This package is used to install all necessary packages for usage from Atomic @@ -608,9 +608,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man*/* %changelog -* Thu Mar 19 2020 sunguoshuai - 2.13.0-5 -- Resolve install conflicts. - * Mon Feb 17 2020 hexiujun - 2.13.0-4 - Type:enhancement - ID:NA