From cebb799458818c655ada54b1070340381d0005a4 Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Mon, 6 Nov 2017 18:26:38 -0500 Subject: [PATCH 1/3] How about yum install? [ci skip] --- docs/installation.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 77f32d25b..91164566e 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -316,7 +316,7 @@ Or for Python 3:: .. Note:: ``redhat-rpm-config`` is required on Fedora 23, but not earlier versions. -Prerequisites are installed on **Ubuntu 14.04 LTS** with:: +Prerequisites can be installed on **Ubuntu 14.04 LTS** with:: $ sudo apt-get install libtiff5-dev libjpeg8-dev zlib1g-dev \ libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \ @@ -324,7 +324,12 @@ Prerequisites are installed on **Ubuntu 14.04 LTS** with:: Then see ``depends/install_raqm.sh`` to install libraqm. -Prerequisites are installed on **Fedora 23** with:: +Prerequisites can be installed on **RedHat/CentOS 7.4** with:: + + $ sudo yum install libjpeg-devel libwebp-devel freetype-devel openjpeg2-devel \ + libtiff-devel libimagequant lcms2-devel + +Prerequisites can be installed on **Fedora 23** with:: $ sudo dnf install libtiff-devel libjpeg-devel zlib-devel freetype-devel \ lcms2-devel libwebp-devel tcl-devel tk-devel libraqm-devel From 0727e83c2ea4cef48a80be0ccf644205dda20e27 Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Mon, 6 Nov 2017 19:05:48 -0500 Subject: [PATCH 2/3] Specify libimagequant-devel [ci skip] --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index 91164566e..6461c0d79 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -327,7 +327,7 @@ Then see ``depends/install_raqm.sh`` to install libraqm. Prerequisites can be installed on **RedHat/CentOS 7.4** with:: $ sudo yum install libjpeg-devel libwebp-devel freetype-devel openjpeg2-devel \ - libtiff-devel libimagequant lcms2-devel + libtiff-devel libimagequant-devel lcms2-devel Prerequisites can be installed on **Fedora 23** with:: From 659906ce3265bc8f51d7fdf9e64bad86062bdd8f Mon Sep 17 00:00:00 2001 From: wiredfool Date: Mon, 1 Jan 2018 14:38:38 +0000 Subject: [PATCH 3/3] Consolidate fedora derivatives --- docs/installation.rst | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 6461c0d79..7bb128628 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -316,7 +316,7 @@ Or for Python 3:: .. Note:: ``redhat-rpm-config`` is required on Fedora 23, but not earlier versions. -Prerequisites can be installed on **Ubuntu 14.04 LTS** with:: +Prerequisites are installed on **Ubuntu 14.04 LTS** with:: $ sudo apt-get install libtiff5-dev libjpeg8-dev zlib1g-dev \ libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \ @@ -324,15 +324,14 @@ Prerequisites can be installed on **Ubuntu 14.04 LTS** with:: Then see ``depends/install_raqm.sh`` to install libraqm. -Prerequisites can be installed on **RedHat/CentOS 7.4** with:: - - $ sudo yum install libjpeg-devel libwebp-devel freetype-devel openjpeg2-devel \ - libtiff-devel libimagequant-devel lcms2-devel - -Prerequisites can be installed on **Fedora 23** with:: +Prerequisites are installed on recent **RedHat** **Centos** or **Fedora** with:: $ sudo dnf install libtiff-devel libjpeg-devel zlib-devel freetype-devel \ - lcms2-devel libwebp-devel tcl-devel tk-devel libraqm-devel + lcms2-devel libwebp-devel tcl-devel tk-devel libraqm-devel \ + libimagequant-devel + +Note that the package manager may be yum or dnf, depending on the +exact distribution. See also the ``Dockerfile``\s in the Test Infrastructure repo (https://github.com/python-pillow/docker-images) for a known working