From 2053e7505fa9313802270ceaa153c1118fe472e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sun, 29 Sep 2024 21:48:30 +0200
Subject: [PATCH] Don't force specific dnf/rpm version on Fedora >= 41

It's not relevant anymore, and also Fedora 41 has DNF5 now.

QubesOS/qubes-issues#9244
---
 update/qubes-vm.sls | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/update/qubes-vm.sls b/update/qubes-vm.sls
index 043790a..1beb6f6 100644
--- a/update/qubes-vm.sls
+++ b/update/qubes-vm.sls
@@ -6,6 +6,7 @@
         # CVE-2021-20271 mitigation
         %_pkgverify_level all
 {% else %}
+{% if grains['os'] == 'Fedora' and grains['osmajorrelease'] < 41 %}
 dnf-and-rpm:
   pkg.installed:
     - pkgs:
@@ -16,6 +17,10 @@ dnf-and-rpm:
   file.absent:
     - require:
       - pkg: dnf-and-rpm
+{% else %}
+/usr/lib/rpm/macros.d/macros.qubes:
+  file.absent: []
+{% endif %}
 {% endif %}
 {% endif %}