From 8cab0b42691a87f359d573152bc1f9ccd7b35d34 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 8 Nov 2024 13:01:11 -0500
Subject: [PATCH] README/spec: Clarify requirements

On Fedora we now need the `podman-machine` package which pulls
in `virtiofsd`.

But also reorder and clean things up so that the MacOS/Fedora instructions
are separate.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 README.md             | 42 +++++++++++++++++++++++-------------------
 rpm/podman-bootc.spec |  1 +
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index b7bdb485..af441d1b 100644
--- a/README.md
+++ b/README.md
@@ -9,27 +9,11 @@ in alignment with the <https://github.com/containers/bootc> project.
 - Be a backend for <https://github.com/containers/podman-desktop-extension-bootc>
 - Work on both MacOS and Linux
 
-## Setup
-
-Requirements:
-
-- [bootc extension requirements](https://github.com/containers/podman-desktop-extension-bootc?tab=readme-ov-file#requirements)
-  - (Even on Linux, you *must* set up `podman machine` with a rootful connection; see below)
-  - `podman machine init --rootful --now`
-- qemu-system-x86_64 / qemu-system-aarch64
-- xorriso/osirrox
-- golang
-- libvirt-devel
-
-
-To compile it, just run in the project directory:
+### MacOS
 
-```shell
-make
-```
+First be sure you have the Podman Desktop [bootc extension requirements](https://github.com/containers/podman-desktop-extension-bootc?tab=readme-ov-file#requirements).
 
-### MacOS
-On MacOS you can use homebrew to install podman-bootc
+On MacOS you can use homebrew to install podman-bootc:
 
 ```
 brew tap germag/podman-bootc
@@ -50,6 +34,11 @@ brew install qemu
 or by other mean and make it available in the path.
 
 ### Fedora
+
+You first must have `podman-machine` installed.
+It is required to have a *rootful* podman machine setup
+via e.g. `podman machine init --rootful --now`.
+
 For Fedora 40 and Rawhide we provide a COPR repository.
 First, enable the COPR repository:
 
@@ -64,6 +53,21 @@ then you can install `podman-bootc` as usual:
 sudo dnf -y install podman-bootc
 ```
 
+## Building from source:
+
+Our generic dependencies:
+
+- qemu-system-x86_64 / qemu-system-aarch64
+- xorriso/osirrox
+- golang
+- libvirt-devel
+
+To compile it, just run in the project directory:
+
+```shell
+make
+```
+
 
 ## Running
 
diff --git a/rpm/podman-bootc.spec b/rpm/podman-bootc.spec
index adbcb228..d150cb02 100644
--- a/rpm/podman-bootc.spec
+++ b/rpm/podman-bootc.spec
@@ -21,6 +21,7 @@ BuildRequires: golang
 BuildRequires: make
 BuildRequires: libvirt-devel
 
+Requires: podman-machine
 Requires: xorriso
 Requires: podman
 Requires: qemu