From patchwork Sun Nov 1 14:13:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John McNamara X-Patchwork-Id: 8507 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id E67F08E79; Sun, 1 Nov 2015 15:13:42 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 6350DB62 for ; Sun, 1 Nov 2015 15:13:40 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 01 Nov 2015 06:13:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,229,1444719600"; d="scan'208";a="808969302" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 01 Nov 2015 06:13:38 -0800 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id tA1EDbEf030693; Sun, 1 Nov 2015 14:13:37 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id tA1EDbu9007610; Sun, 1 Nov 2015 14:13:37 GMT Received: (from jmcnam2@localhost) by sivswdev02.ir.intel.com with id tA1EDbNP007605; Sun, 1 Nov 2015 14:13:37 GMT From: John McNamara To: dev@dpdk.org Date: Sun, 1 Nov 2015 14:13:33 +0000 Message-Id: <1446387213-7568-1-git-send-email-john.mcnamara@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1445340730-32687-1-git-send-email-john.mcnamara@intel.com> References: <1445340730-32687-1-git-send-email-john.mcnamara@intel.com> Subject: [dpdk-dev] [PATCH v2] doc: remove dejavu font from doc build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Remove requirement for occasionally hard to find/install DejaVuSansMono font. It isn't gnerally required anyway. The default mono font is sufficient. Signed-off-by: John McNamara Acked-by: Harry van Haaren --- doc/guides/conf.py | 1 - doc/guides/contributing/documentation.rst | 20 ++++++++------------ pkg/dpdk.spec | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/doc/guides/conf.py b/doc/guides/conf.py index b2290b4..4a4fad2 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py @@ -59,7 +59,6 @@ latex_documents = [ # Latex directives to be included directly in the latex/pdf docs. latex_preamble = r""" \usepackage[utf8]{inputenc} -\usepackage{DejaVuSansMono} \usepackage[T1]{fontenc} \usepackage{helvet} \renewcommand{\familydefault}{\sfdefault} diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst index 7f5f061..6b8a5c6 100644 --- a/doc/guides/contributing/documentation.rst +++ b/doc/guides/contributing/documentation.rst @@ -142,7 +142,7 @@ The following dependencies must be installed to build the documentation: * Sphinx (also called python-sphinx). -* TexLive (at least TexLive-core, extra Latex support and extra fonts). +* TexLive. * Inkscape. @@ -158,18 +158,17 @@ It can be installed as follows: sudo yum -y install doxygen `Sphinx`_ is a Python documentation tool for converting RST files to Html or to PDF (via LaTeX). -It can be installed as follows: +For full support with figure and table captioning the latest version of Sphinx can be installed as follows: .. code-block:: console # Ubuntu/Debian. - sudo apt-get -y install python-sphinx + sudo apt-get -y install python-pip + sudo pip install --upgrade sphinx # Red Hat/Fedora. - sudo yum -y install python-sphinx - - # Or, on any system with Python installed. - sudo easy_install -U sphinx + sudo yum -y install python-pip + sudo pip install --upgrade sphinx For further information on getting started with Sphinx see the `Sphinx Tutorial `_. @@ -196,13 +195,10 @@ The main required packages can be installed as follows: .. code-block:: console # Ubuntu/Debian. - sudo apt-get -y install texlive-latex-extra texlive-fonts-extra \ - texlive-fonts-recommended - + sudo apt-get -y install texlive-latex-extra # Red Hat/Fedora, selective install. - sudo yum -y install texlive-collection-latexextra \ - texlive-collection-fontsextra + sudo yum -y install texlive-collection-latexextra Build commands diff --git a/pkg/dpdk.spec b/pkg/dpdk.spec index acbb2be..2d27d40 100644 --- a/pkg/dpdk.spec +++ b/pkg/dpdk.spec @@ -46,7 +46,7 @@ ExclusiveArch: i686, x86_64 BuildRequires: kernel-devel, kernel-headers, libpcap-devel, xen-devel BuildRequires: doxygen, python-sphinx, inkscape -BuildRequires: texlive-collection-latexextra, texlive-collection-fontsextra +BuildRequires: texlive-collection-latexextra %description DPDK core includes kernel modules, core libraries and tools.