From f5abe0abd0938508666ff1aa22674eabd03a05eb Mon Sep 17 00:00:00 2001
From: Alex Pyrgiotis <alex.p@freedom.press>
Date: Thu, 31 Aug 2023 13:25:20 +0300
Subject: [PATCH] Update RPM dependencies

Update the dependencies required to build RPM packages. More
specifically, remove the older python3-setuptools dependency, and depend
instead on python3-devel and python3-poetry-core.

Note that this commit may break our CI, but it will be resolved in
subsequent commits.
---
 .circleci/config.yml | 5 +++--
 BUILD.md             | 6 ++++--
 dev_scripts/env.py   | 3 ++-
 dev_scripts/qa.py    | 3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 18493b9..d3c46cb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,7 +28,8 @@ aliases:
   - &install-dependencies-rpm
     name: Install dependencies (rpm)
     command: |
-      dnf install -y rpm-build python3 python3-setuptools
+      dnf install -y rpm-build python3 python3-devel python3-poetry-core pipx
+      pipx install poetry
 
   - &build-deb
     name: Build the .deb package
@@ -39,7 +40,7 @@ aliases:
   - &build-rpm
     name: Build the .rpm package
     command: |
-      ./install/linux/build-rpm.py
+      PATH=/root/.local/bin:$PATH ./install/linux/build-rpm.py
       ls -lh dist/
 
   - &calculate-cache-key
diff --git a/BUILD.md b/BUILD.md
index 5ca4f0d..7fc22d0 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -60,7 +60,8 @@ Create a .deb:
 Install dependencies:
 
 ```sh
-sudo dnf install -y rpm-build podman python3 pipx qt6-qtbase-gui
+sudo dnf install -y rpm-build podman python3 python3-devel python3-poetry-core \
+    pipx qt6-qtbase-gui
 ```
 
 Install Poetry using `pipx`:
@@ -172,7 +173,8 @@ Overview of the qubes you'll create:
 1. Install dependencies:
 
    ```
-   sudo dnf install -y rpm-build pipx qt6-qtbase-gui libreoffice python3-magic \
+   sudo dnf install -y rpm-build podman python3 python3-devel \
+       python3-poetry-core pipx qt6-qtbase-gui libreoffice python3-magic \
        tesseract*
    ```
 
diff --git a/dev_scripts/env.py b/dev_scripts/env.py
index c728bd7..38358c8 100755
--- a/dev_scripts/env.py
+++ b/dev_scripts/env.py
@@ -108,7 +108,8 @@ RUN apt-get update \
 
 # FIXME: Install Poetry on Fedora via package manager.
 DOCKERFILE_BUILD_DEV_FEDORA_DEPS = r"""
-RUN dnf install -y rpm-build podman python3 python3-setuptools pipx make qt6-qtbase-gui \
+RUN dnf install -y rpm-build podman python3 python3-devel python3-poetry-core \
+    pipx make qt6-qtbase-gui \
     && dnf clean all
 
 # FIXME: Drop this fix after it's resolved upstream.
diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py
index 77ab64e..9730abb 100755
--- a/dev_scripts/qa.py
+++ b/dev_scripts/qa.py
@@ -236,7 +236,8 @@ CONTENT_BUILD_FEDORA = r"""## Fedora
 Install dependencies:
 
 ```sh
-sudo dnf install -y rpm-build podman python3 pipx qt6-qtbase-gui
+sudo dnf install -y rpm-build podman python3 python3-devel python3-poetry-core \
+    pipx qt6-qtbase-gui
 ```
 
 Install Poetry using `pipx`: