From 4f6ab9bffa786d3b74418ffad16415dc26280fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 1 Oct 2024 14:32:40 +0200
Subject: [PATCH] Do not build python3-dnf-plugins-qubes-hooks on Fedora >= 41

It's not relevant for DNF5 anymore.
Since that subpackage had the only BR: python3-devel, move it to the
main package for "qubesagent" python package build.

QubesOS/qubes-issues#9244

(cherry picked from commit fd441f0d3490a475a1d26217864447ecdfb670f0)
---
 rpm_spec/core-agent.spec.in | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 3f058ac9..d8153318 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -201,6 +201,7 @@ BuildRequires: qubes-utils-devel >= 4.2.17
 BuildRequires: qubes-libvchan-%{?qubes_backend_vmm}%{?!qubes_backend_vmm:@BACKEND_VMM@}-devel
 BuildRequires: pam-devel
 BuildRequires: python%{python3_pkgversion}-setuptools
+BuildRequires: python%{python3_pkgversion}-devel
 BuildRequires: systemd
 %if 0%{?rhel} >= 8
 BuildRequires: redhat-lsb
@@ -230,6 +231,8 @@ Requires: (gnome-keyring if xdg-desktop-portal)
 %description
 The Qubes core files for installation inside a Qubes VM.
 
+%if 0%{?fedora} < 41
+# not relevant anymore with DNF5
 %if 0%{?rhel} == 8
 %package -n python3-dnf-plugins-qubes-hooks
 Summary: DNF plugin for Qubes specific post-installation actions
@@ -257,6 +260,7 @@ DNF plugin for Qubes specific post-installation actions:
  * notify dom0 that updates were installed
  * refresh applications shortcut list
 %endif
+%endif
 
 %if 0%{?rhel} != 7
 %package caja
@@ -964,8 +968,8 @@ rm -f %{name}-%{version}
 /etc/yum/pluginconf.d/yum-qubes-hooks.conf
 /usr/lib/yum-plugins/yum-qubes-hooks.py*
 %endif
-%endif
 %config(noreplace) /etc/dnf/plugins/qubes-hooks.conf
+%endif
 %dir /etc/dconf/db/local.d
 %config(noreplace) /etc/dconf/db/local.d/dpi
 %config(noreplace) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
@@ -1066,6 +1070,8 @@ rm -f %{name}-%{version}
 %dir /mnt/removable
 %dir /rw
 
+%if 0%{?fedora} < 41
+# not relevant anymore with DNF5
 %if 0%{?rhel} == 8
 %files -n python3-dnf-plugins-qubes-hooks
 %{plateform_python3_sitelib}/dnf-plugins/*
@@ -1073,6 +1079,7 @@ rm -f %{name}-%{version}
 %files -n python%{python3_pkgversion}-dnf-plugins-qubes-hooks
 %{python3_sitelib}/dnf-plugins/*
 %endif
+%endif
 
 %if 0%{?rhel} != 7
 %files caja