#1 Fix ambiguous Python 2 dependency declarations
Merged 4 years ago by mhabrnal. Opened 4 years ago by ishcherb.
rpms/ ishcherb/abrt pyambiguous  into  master

file modified
+16 -12
@@ -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: 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 @@ 

  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-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 @@ 

  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 @@ 

  %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

  

This package uses names with ambiguous python- prefix in requirements.

According to Fedora Packaging guidelines for Python, packages must use names with either python2- or python3- prefix in requirements where available.
We are aiming to rename python-* dependencies to python2-*, so we can later switch the python-* namespace to Python 3.

This PR is part of Fedora's Switch to Python 3 effort.

Note that, although this PR was created automatically, we will respond to any comments or issues which you might find with it. We will keep the PR open for review for a week, and if there's no feedback we'll merge it.

Koji scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=23642779
Note: please do not backport this to f26 branch(es) as some of the modified requirements are not available there

This PR was opened automatically, for source code see here

Thank you for the PR. It looks good to me.

@mhabrnal Can you please take over the patch to upstream?

@ishcherb thank you!

Looks like python2-humanize doesn't exist.

@mhabrnal thank you for the review!

python2-humanize does exist, but only in Rawhide. So it will fail to build on f27, f26, and should not be backported to those branches (I know the PR description mentions f26 only, I have already addressed that bug in the script which created the PR).

Pull-Request has been merged by mhabrnal

4 years ago