From 7069a6ada981635d25bc9d5cf27e1eb9d7a96734 Mon Sep 17 00:00:00 2001 From: compu42 <56663749+compu42@users.noreply.github.com> Date: Sat, 16 Jan 2021 14:18:18 +0000 Subject: [PATCH 1/3] Fedora Prerequisites are (possibly) inaccurate `python3-devel` is required to build the wheel for Twisted, otherwise it'll just fail. `psycopg2` is also required for Postgresql. I don't believe these come with the "Development Tools" group, but I might be mistaken. --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index d405d9fe555c..6dbe8f53deca 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -156,7 +156,7 @@ Installing prerequisites on CentOS 8 or Fedora>26: ```sh sudo dnf install libtiff-devel libjpeg-devel libzip-devel freetype-devel \ libwebp-devel tk-devel redhat-rpm-config \ - python3-virtualenv libffi-devel openssl-devel + python3-virtualenv libffi-devel openssl-devel python3-devel phycopg2 sudo dnf groupinstall "Development Tools" ``` From 1cc90a4b55874383e2227ed9b4e03996222b9456 Mon Sep 17 00:00:00 2001 From: compu42 <56663749+compu42@users.noreply.github.com> Date: Fri, 22 Jan 2021 01:41:04 +0000 Subject: [PATCH 2/3] Update INSTALL.md Signed-off-by: Joseph Arnault --- INSTALL.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 6dbe8f53deca..4dded346c92d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -156,10 +156,12 @@ Installing prerequisites on CentOS 8 or Fedora>26: ```sh sudo dnf install libtiff-devel libjpeg-devel libzip-devel freetype-devel \ libwebp-devel tk-devel redhat-rpm-config \ - python3-virtualenv libffi-devel openssl-devel python3-devel phycopg2 + python3-virtualenv libffi-devel openssl-devel python3-devel python3-phycopg2 sudo dnf groupinstall "Development Tools" ``` +Signed-off-by: Joseph Arnault + Installing prerequisites on CentOS 7 or Fedora<=25: ```sh From 299fda601ff423d5d6de4feeaf0d9f31246bbb87 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Thu, 4 Feb 2021 15:40:19 +0000 Subject: [PATCH 3/3] Update installation instructions on Fedora Signed-off-by: Dan Callahan --- INSTALL.md | 22 +++------------------- changelog.d/9322.doc | 1 + 2 files changed, 4 insertions(+), 19 deletions(-) create mode 100644 changelog.d/9322.doc diff --git a/INSTALL.md b/INSTALL.md index 4dded346c92d..b9e3f613d153 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -151,31 +151,15 @@ sudo pacman -S base-devel python python-pip \ ##### CentOS/Fedora -Installing prerequisites on CentOS 8 or Fedora>26: +Installing prerequisites on CentOS or Fedora Linux: ```sh sudo dnf install libtiff-devel libjpeg-devel libzip-devel freetype-devel \ - libwebp-devel tk-devel redhat-rpm-config \ - python3-virtualenv libffi-devel openssl-devel python3-devel python3-phycopg2 + libwebp-devel libxml2-devel libxslt-devel libpq-devel \ + python3-virtualenv libffi-devel openssl-devel python3-devel sudo dnf groupinstall "Development Tools" ``` -Signed-off-by: Joseph Arnault - -Installing prerequisites on CentOS 7 or Fedora<=25: - -```sh -sudo yum install libtiff-devel libjpeg-devel libzip-devel freetype-devel \ - lcms2-devel libwebp-devel tcl-devel tk-devel redhat-rpm-config \ - python3-virtualenv libffi-devel openssl-devel -sudo yum groupinstall "Development Tools" -``` - -Note that Synapse does not support versions of SQLite before 3.11, and CentOS 7 -uses SQLite 3.7. You may be able to work around this by installing a more -recent SQLite version, but it is recommended that you instead use a Postgres -database: see [docs/postgres.md](docs/postgres.md). - ##### macOS Installing prerequisites on macOS: diff --git a/changelog.d/9322.doc b/changelog.d/9322.doc new file mode 100644 index 000000000000..c393a3a29944 --- /dev/null +++ b/changelog.d/9322.doc @@ -0,0 +1 @@ +Update installation instructions on Fedora.