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

file modified
+18 -14
@@ -1,6 +1,6 @@ 

  Name:           deluge

  Version:        1.3.15

- Release:        3%{?dist}

+ Release:        4%{?dist}

  Summary:        A GTK+ BitTorrent client with support for DHT, UPnP, and PEX

  Group:          Applications/Internet

  License:        GPLv3 with exceptions
@@ -18,7 +18,7 @@ 

  BuildRequires: python2-devel

  BuildRequires: python2-setuptools

  BuildRequires: intltool

- BuildRequires: rb_libtorrent-python

+ BuildRequires: rb_libtorrent-python2

  

  ## add Requires to make into Meta package

  Requires: %{name}-common = %{version}-%{release}
@@ -41,16 +41,16 @@ 

  Summary:    Files common to Deluge sub packages

  Group:      Applications/Internet

  License:    GPLv3 with exceptions

- Requires:   python-setuptools

- Requires:   pyOpenSSL

- Requires:   python-chardet

- Requires:   pyxdg

- Requires:   rb_libtorrent-python

- Requires:   python-twisted-web

- Requires:   pygame

- Requires:   python-GeoIP

- Requires:   python-setproctitle

- Requires:   python-rencode

+ Requires:   python2-setuptools

+ Requires:   python2-pyOpenSSL

+ Requires:   python2-chardet

+ Requires:   python2-pyxdg

+ Requires:   rb_libtorrent-python2

+ Requires:   python2-twisted

+ Requires:   python2-pygame

+ Requires:   python2-GeoIP

+ Requires:   python2-setproctitle

+ Requires:   python2-rencode

  

  %description common

  Common files needed by the Deluge bittorrent client sub packages
@@ -64,7 +64,7 @@ 

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

  ## Required for the proper ownership of icon dirs.

  Requires:   hicolor-icon-theme

- Requires:   notify-python

+ Requires:   python2-notify

  Requires:   pygtk2-libglade

  

  %description gtk
@@ -90,7 +90,7 @@ 

  Summary:    Web interface to Deluge

  Group:      Applications/Internet

  License:    GPLv3 with exceptions

- Requires:   python-mako

+ Requires:   python2-mako

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

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

  Requires:   %{name}-daemon = %{version}-%{release}
@@ -278,6 +278,10 @@ 

  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

  

  %changelog

+ * Wed Jan 03 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.3.15-4

+ - Update Python 2 dependency declarations to new packaging standards

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

+ 

  * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.15-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

  

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.
The local mock build passed, for Koji scratch build please see simple-koji-ci result.

Note: please do not backport this to f26, f27 branch(es) 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 mooninite

6 years ago