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

file modified
+9 -5
@@ -226,11 +226,11 @@ 

  %if ( 0%{_for_fedora_koji_builds} )

  Name:             glusterfs

  Version:          4.0.0

- Release:          %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}

+ Release:          %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}.1

  %else

  Name:             @PACKAGE_NAME@

  Version:          @PACKAGE_VERSION@

- Release:          0.@PACKAGE_RELEASE@%{?dist}.5

+ Release:          0.@PACKAGE_RELEASE@%{?dist}.6

  %endif

  License:          GPLv2 or LGPLv3+

  URL:              http://docs.gluster.org/
@@ -410,7 +410,7 @@ 

  %package events

  Summary:          GlusterFS Events

  Requires:         %{name}-server%{?_isa} = %{version}-%{release}

- Requires:         python2 python-prettytable

+ Requires:         python2 python2-prettytable

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

  %if ( 0%{?rhel} )

  Requires:         python-requests
@@ -488,7 +488,7 @@ 

  Requires:         %{name} = %{version}-%{release}

  Requires:         %{name}-server = %{version}-%{release}

  Requires:         python2

- Requires:         python-prettytable

+ Requires:         python2-prettytable

  %if ( 0%{?rhel} && 0%{?rhel} <= 7 )

  BuildRequires:    python-ctypes

  %endif
@@ -681,7 +681,7 @@ 

  %if ( 0%{?fedora} && 0%{?fedora} >= 28 )

  Requires:         python2-pyxattr

  %else

- Requires:         pyxattr

nope. Look up two lines. this is the %else clause of %if fedora

+ Requires:         python2-pyxattr

  %endif

  %if (0%{?_with_valgrind:1})

  Requires:         valgrind
@@ -1454,6 +1454,10 @@ 

  %endif

  

  %changelog

+ * Thu Mar 01 2018 Iryna Shcherbina <ishcherb@redhat.com> - 4.0.0-0.1.rc1.1

+ - Update Python 2 dependency declarations to new packaging standards

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

+ 

  * Tue Feb 27 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0rc1-1

  - 4.0.0 RC1

  

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

nope. Look up two lines. this is the %else clause of %if fedora

@kkeithle thanks for spotting that. I missed that when reviewed patches.
Thanks for applying the patch, closing the PR.

Pull-Request has been closed by ishcherb

6 years ago