!4 resolve install conflicts

Merge pull request !4 from sigui/sgs-own
This commit is contained in:
openeuler-ci-bot 2020-03-20 10:51:46 +08:00 committed by Gitee
commit 0ff31a8ba8

View File

@ -1,6 +1,6 @@
Name: abrt Name: abrt
Version: 2.13.0 Version: 2.13.0
Release: 4 Release: 5
Summary: A tool for automatic bug detection and reporting Summary: A tool for automatic bug detection and reporting
License: GPLv2+ License: GPLv2+
URL: https://abrt.readthedocs.org/ URL: https://abrt.readthedocs.org/
@ -139,7 +139,7 @@ uncaught exception in python3 programs.
%package -n python3-abrt-container-addon %package -n python3-abrt-container-addon
Summary: Container addon for catching Python3 exceptions for abrt Summary: Container addon for catching Python3 exceptions for abrt
Conflicts: python3-abrt-addon Conflicts: python3-abrt-addon < %{version}-%{release}
Requires: container-exception-logger Requires: container-exception-logger
%description -n python3-abrt-container-addon %description -n python3-abrt-container-addon
@ -200,7 +200,7 @@ environment.
%package atomic %package atomic
Summary: Package to make easy default installation on Atomic hosts. Summary: Package to make easy default installation on Atomic hosts.
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Conflicts: %{name}-addon-ccpp Conflicts: %{name}-addon-ccpp < %{version}-%{release}
%description atomic %description atomic
This package is used to install all necessary packages for usage from Atomic This package is used to install all necessary packages for usage from Atomic
@ -608,6 +608,9 @@ killall abrt-dbus >/dev/null 2>&1 || :
%{_mandir}/man*/* %{_mandir}/man*/*
%changelog %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 * Mon Feb 17 2020 hexiujun <hexiujun1@huawei.com> - 2.13.0-4
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA