From 4cc9ae5a1d89f7f2a93882163c7553e66ba35c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sat, 8 Jun 2019 05:36:40 +0200
Subject: [PATCH] rpm,deb: add Conflicts: qubes-gui-agent < 4.1.0

This version will not work with qubes-gui-agent not supporting -d
option.

QubesOS/qubes-issues#2619
---
 debian/control              | 6 +++++-
 rpm_spec/core-agent.spec.in | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e8703c8..354072f 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,11 @@ Recommends:
     xserver-xorg-core,
     xsettingsd,
     xterm
-Conflicts: qubes-core-agent-linux, firewalld, qubes-core-vm-sysvinit
+Conflicts:
+    qubes-core-agent-linux,
+    firewalld,
+    qubes-core-vm-sysvinit,
+    qubes-gui-agent (<< 4.1.0-1)
 Description: Qubes core agent
  This package includes various daemons necessary for qubes domU support,
  such as qrexec services.
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 27a5420..cce10a8 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -148,6 +148,7 @@ Provides:   qubes-core-vm = %{version}-%{release}
 Obsoletes:  qubes-core-vm < 4.0.0
 Provides:	qubes-core-vm-doc = %{version}-%{release}
 Obsoletes:	qubes-core-vm-doc < 4.0.0
+Conflicts:	qubes-gui-agent < 4.1.0
 BuildRequires: gcc
 BuildRequires: pandoc
 BuildRequires: xen-devel
@@ -809,6 +810,7 @@ Provides:       qubes-core-agent-init-scripts
 Conflicts:      qubes-core-agent-sysvinit
 Provides:       qubes-core-vm-systemd = %{version}-%{release}
 Obsoletes:      qubes-core-vm-systemd < 4.0.0
+Conflicts:      qubes-gui-agent < 4.1.0
 
 %description systemd
 The Qubes core startup configuration for SystemD init.