Fix ambiguous Python 2 dependency declarations

This commit is contained in:
Iryna Shcherbina 2017-12-11 14:39:41 +01:00
parent 37ad20102e
commit d663542b40

View File

@ -56,7 +56,7 @@
Summary: Automatic bug detection and reporting tool
Name: abrt
Version: 2.10.5
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://abrt.readthedocs.org/
@ -91,15 +91,15 @@ BuildRequires: doxygen
BuildRequires: xmlto
BuildRequires: libreport-devel >= %{libreport_ver}
BuildRequires: satyr-devel >= %{satyr_ver}
BuildRequires: systemd-python
BuildRequires: python2-systemd
BuildRequires: python3-systemd
BuildRequires: augeas
BuildRequires: libselinux-devel
BuildRequires: python2-argcomplete
BuildRequires: python3-argcomplete
BuildRequires: python-argh
BuildRequires: python2-argh
BuildRequires: python3-argh
BuildRequires: python-humanize
BuildRequires: python2-humanize
BuildRequires: python3-humanize
Requires: libreport >= %{libreport_ver}
@ -288,7 +288,7 @@ Search for a new updates in bodhi server.
Summary: %{name}'s addon for catching and analyzing Python exceptions
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: systemd-python
Requires: python2-systemd
Requires: python2-abrt
# Remove before F30
Provides: abrt-addon-python = %{version}-%{release}
@ -352,9 +352,9 @@ Requires: abrt-libs = %{version}-%{release}
Requires: abrt-dbus
Requires: python2-abrt
Requires: abrt-addon-ccpp
Requires: python-argh
Requires: python2-argh
Requires: python2-argcomplete
Requires: python-humanize
Requires: python2-humanize
Requires: /usr/bin/register-python-argcomplete
%description cli-ng
@ -461,17 +461,17 @@ Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-dbus = %{version}-%{release}
Requires: dbus-python
Requires: libreport-python
Requires: python2-dbus
Requires: python2-libreport
Requires: python2-gobject-base
%{?python_provide:%python_provide python2-abrt}
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
BuildRequires: python-nose
BuildRequires: python-sphinx
BuildRequires: libreport-python
BuildRequires: python2-nose
BuildRequires: python2-sphinx
BuildRequires: python2-libreport
%description -n python2-abrt
High-level API for querying, creating and manipulating
@ -1166,6 +1166,10 @@ killall abrt-dbus >/dev/null 2>&1 || :
%config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
%changelog
* Mon Dec 11 2017 Iryna Shcherbina <ishcherb@redhat.com> - 2.10.5-3
- Fix ambiguous Python 2 dependency declarations
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.10.5-2
- Rebuilt for libjson-c.so.3