#1 Update Python 2 dependency declarations to new packaging standards
Merged 6 years ago by jskarvad. Opened 6 years ago by ishcherb.
rpms/ ishcherb/uhd pyambiguous  into  master

file modified
+9 -5
@@ -26,17 +26,17 @@ 

  Name:           uhd

  URL:            http://code.ettus.com/redmine/ettus/projects/uhd/wiki

  Version:        %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4}

- Release:        2%{?dist}

+ Release:        3%{?dist}

  License:        GPLv3+

  BuildRequires:  cmake

- BuildRequires:  boost-devel, libusb1-devel, python-cheetah, ncurses-devel

- BuildRequires:  docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel

- BuildRequires:  python-mako

+ BuildRequires:  boost-devel, libusb1-devel, python2-cheetah, ncurses-devel

+ BuildRequires:  python2-docutils, doxygen, pkgconfig, libpcap-devel, wireshark-devel

+ BuildRequires:  python2-mako

  %if ! %{with binary_firmware}

  BuildRequires:  sdcc sed

  %endif

  Requires(pre):  shadow-utils

- Requires:       tkinter

+ Requires:       python2-tkinter

  Group:          Applications/Engineering

  Summary:        Universal Hardware Driver for Ettus Research products

  Source0:        http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz
@@ -212,6 +212,10 @@ 

  %{_bindir}/chdr_log

  

  %changelog

+ * Wed Feb 28 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.10.3.0-3

+ - Update Python 2 dependency declarations to new packaging standards

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

+ 

  * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.10.3.0-2

  - Escape macros in %%changelog

  

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 merged by jskarvad

6 years ago