From dae1ac670ee0f2769ad950833f96d2e445c52d3c Mon Sep 17 00:00:00 2001
From: 3np <3np@example.com>
Date: Thu, 19 Jun 2025 01:04:23 +0000
Subject: [PATCH] qubes-core-agent: remove conflict with firewalld

---
 debian/control              | 1 -
 rpm_spec/core-agent.spec.in | 1 -
 2 files changed, 2 deletions(-)

diff --git a/debian/control b/debian/control
index c4df62c83..6b0a5769a 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,6 @@ Recommends:
     xterm
 Conflicts:
     qubes-core-agent-linux,
-    firewalld,
     qubes-core-vm-sysvinit,
     qubes-gui-agent (<< 4.1.6-1),
     pulseaudio-qubes (<< 4.2.0-1),
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 4ab1c835f..d722e0170 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -125,7 +125,6 @@ Vendor:     Invisible Things Lab
 License:    GPL
 URL:        https://www.qubes-os.org
 
-Conflicts:  firewalld
 Requires:   xdg-utils
 Requires:   qubes-utils >= 3.1.3
 Requires:   qubes-utils-libs >= 4.3.1