#2 Update Python 2 dependency declarations to new packaging standards
Closed 5 years ago by rcritten. Opened 6 years ago by ishcherb.
rpms/ ishcherb/freeipa pyambiguous  into  master

file modified
+11 -9
@@ -100,7 +100,7 @@ 

  

  Name:           freeipa

  Version:        %{VERSION}

- Release:        6.1%{?dist}

+ Release:        7.1%{?dist}

  Summary:        The Identity, Policy and Audit system

  

  Group:          System Environment/Base
@@ -166,7 +166,7 @@ 

  BuildRequires:  rhino

  BuildRequires:  libverto-devel

  BuildRequires:  libunistring-devel

- BuildRequires:  python-lesscpy

+ BuildRequires:  python2-lesscpy

  %endif # ONLY_CLIENT

  

  #
@@ -218,7 +218,7 @@ 

  BuildRequires:  python2-libipa_hbac

  BuildRequires:  python2-lxml

  # 5.0.0: QRCode.print_ascii

- BuildRequires:  python-qrcode-core >= 5.0.0

+ BuildRequires:  python2-qrcode-core >= 5.0.0

  # 1.15: python-dns changed return type in to_text() method in PY3

  BuildRequires:  python2-dns >= 1.15

  BuildRequires:  jsl
@@ -347,7 +347,7 @@ 

  Requires(postun): python2

  Requires: python2-gssapi >= 1.2.0-5

  Requires: python2-systemd

- Requires: mod_wsgi

+ Requires: python2-mod_wsgi

  %endif

  Requires: mod_auth_gssapi >= 1.5.0

  Requires: mod_ssl
@@ -580,13 +580,11 @@ 

  Requires: python3-ipaclient = %{version}-%{release}

  Requires: python3-pyldap >= %{python3_ldap_version}

  Requires: python3-sssdconfig

- Requires: python3-sssdconfig

  %else

  Requires: python2-gssapi >= 1.2.0-5

  Requires: python2-ipaclient = %{version}-%{release}

  Requires: python2-ldap >= %{python2_ldap_version}

  Requires: python2-sssdconfig

- Requires: python2-sssdconfig

  %endif

  Requires: cyrus-sasl-gssapi%{?_isa}

  Requires: ntp
@@ -749,7 +747,7 @@ 

  Requires: python2-cryptography >= 1.6

  Requires: python2-netaddr >= %{python_netaddr_version}

  Requires: python2-libipa_hbac

- Requires: python-qrcode-core >= 5.0.0

+ Requires: python2-qrcode-core >= 5.0.0

  Requires: python2-pyasn1 >= 0.3.2-2

  Requires: python2-pyasn1-modules >= 0.3.2-2

  Requires: python2-dateutil
@@ -770,7 +768,7 @@ 

  Requires: python2-dns >= 1.15

  Requires: python2-enum34

  Requires: python2-netifaces >= 0.10.4

- Requires: pyusb

+ Requires: python2-pyusb

  

  Conflicts: %{alt_name}-python < %{version}

  
@@ -866,7 +864,7 @@ 

  Requires: python2-ipaserver = %{version}-%{release}

  Requires: tar

  Requires: xz

- Requires: pytest >= 2.6

+ Requires: python2-pytest >= 2.6

  Requires: python2-paste

  Requires: python2-coverage

  # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1096506
@@ -1721,6 +1719,10 @@ 

  %endif # with_ipatests

  

  %changelog

+ * Fri Mar 23 2018 Iryna Shcherbina <ishcherb@redhat.com> - 4.6.90.pre1-7.1

+ - Update Python 2 dependency declarations to new packaging standards

+   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)

+ 

  * Wed Mar 21 2018 Alexander Bokovoy <abokovoy@redhat.com> - 4.6.90.pre1-6.1

  - Change upgrade code to use DIR-based ccache and no kinit (#1558818)

  - Require pki-symkey until pki-core has proper dependencies

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. There is no need to build the package right after merge, this change can wait for the next package rebuild.
The local mock build passed, for Koji scratch build please see simple-koji-ci result.

Note: please do not backport this to f26, f27 branches, as some of the modified requirements are not available there

This PR was opened automatically, for source code see here

Pull-Request has been closed by rcritten

5 years ago