diff options
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | Documentation/intro/install/documentation.rst | 6 | ||||
-rw-r--r-- | Documentation/intro/install/rhel.rst | 2 | ||||
-rwxr-xr-x | build-aux/dpdkstrip.py | 2 | ||||
-rw-r--r-- | rhel/openvswitch-fedora.spec.in | 2 | ||||
-rw-r--r-- | rhel/openvswitch.spec.in | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 370b3d0a6..68026312b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ addons: - libjemalloc1 - libjemalloc-dev - libnuma-dev - - python-sphinx + - python3-sphinx - libelf-dev - selinux-policy-dev - libunbound-dev diff --git a/Documentation/intro/install/documentation.rst b/Documentation/intro/install/documentation.rst index d7eb25d9e..acf5b3a3f 100644 --- a/Documentation/intro/install/documentation.rst +++ b/Documentation/intro/install/documentation.rst @@ -45,11 +45,11 @@ Sphinx. A detailed guide on installing Sphinx in many environments is available on the `Sphinx website`__ but, for most Linux distributions, you can install with your package manager. For example, on Debian/Ubuntu run:: - $ sudo apt-get install python-sphinx + $ sudo apt-get install python3-sphinx Similarly, on RHEL/Fedora run:: - $ sudo dnf install python-sphinx + $ sudo dnf install python3-sphinx A ``requirements.txt`` is also provided in the ``/Documentation``, should you wish to install using ``pip``:: @@ -71,7 +71,7 @@ available on the `Sphinx website`__. Building -------- -Once Sphinx installed, the documentation can be built using the provided +Once Sphinx is installed, the documentation can be built using the provided Makefile targets:: $ make docs-check diff --git a/Documentation/intro/install/rhel.rst b/Documentation/intro/install/rhel.rst index 6f062e894..0e5ca2743 100644 --- a/Documentation/intro/install/rhel.rst +++ b/Documentation/intro/install/rhel.rst @@ -89,7 +89,7 @@ And to install specific dependencies, use yum-builddep tool:: Once that is completed, remove the file ``/tmp/ovs.spec``. -If python-sphinx package is not available in your version of RHEL, you can +If python3-sphinx package is not available in your version of RHEL, you can install it via pip with 'pip install sphinx'. Open vSwitch requires python 2.7 or newer which is not available in older diff --git a/build-aux/dpdkstrip.py b/build-aux/dpdkstrip.py index 48c7f0693..b8b8ba9c8 100755 --- a/build-aux/dpdkstrip.py +++ b/build-aux/dpdkstrip.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # Copyright (c) 2017 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 9c752ff4e..614c5f9f0 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -79,7 +79,7 @@ BuildRequires: python3-devel BuildRequires: desktop-file-utils BuildRequires: groff graphviz BuildRequires: checkpolicy, selinux-policy-devel -BuildRequires: /usr/bin/sphinx-build +BuildRequires: /usr/bin/sphinx-build-3 # make check dependencies BuildRequires: %{_py2}-twisted%{?rhel:-core} %{_py2}-zope-interface %{_py2}-six BuildRequires: procps-ng diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in index c8361f5f2..7f27fedd6 100644 --- a/rhel/openvswitch.spec.in +++ b/rhel/openvswitch.spec.in @@ -37,7 +37,7 @@ BuildRequires: python-six BuildRequires: openssl-devel BuildRequires: checkpolicy, selinux-policy-devel BuildRequires: autoconf, automake, libtool -BuildRequires: python-sphinx +BuildRequires: python3-sphinx BuildRequires: unbound-devel %bcond_without check |