回退 'Pull Request !4 : resolve install conflicts'

This commit is contained in:
严志华 2020-03-20 14:58:08 +08:00 committed by Gitee
parent 0ff31a8ba8
commit a5ce1c980a

View File

@ -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 <sunguoshuai@huawei.com> - 2.13.0-5
- Resolve install conflicts.
* Mon Feb 17 2020 hexiujun <hexiujun1@huawei.com> - 2.13.0-4
- Type:enhancement
- ID:NA