From 6182c5c490bf5e7677116bf9e9518d3f7a9284a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 15 Jul 2020 14:11:38 +0200
Subject: [PATCH] rpm/deb: require new enough qubes-gui-daemon

qvm-start-daemon now uses `qubes-guid -C` - ensure correct version
installed.
But to not require qubes-gui-daemon installed always, use reverse
conflict dependency.
---
 debian/control                           | 4 +++-
 rpm_spec/qubes-core-admin-client.spec.in | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index cd2a0d7..ee2a85b 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,9 @@ Depends:
  ${python:Depends},
  ${python3:Depends},
  ${misc:Depends}
-Conflicts: qubes-core-agent (<< 4.1.9)
+Conflicts:
+ qubes-core-agent (<< 4.1.9),
+ qubes-gui-daemon (<< 4.1.7)
 Description: Qubes administrative tools
  Tools to manage Qubes system using Admin API
 
diff --git a/rpm_spec/qubes-core-admin-client.spec.in b/rpm_spec/qubes-core-admin-client.spec.in
index 0e0bb93..156c792 100644
--- a/rpm_spec/qubes-core-admin-client.spec.in
+++ b/rpm_spec/qubes-core-admin-client.spec.in
@@ -16,6 +16,8 @@ Requires:   python%{python3_pkgversion}-yaml
 BuildArch:  noarch
 Source0: %{name}-%{version}.tar.gz
 Conflicts:  qubes-core-agent < 4.1.9
+# qubes-guid -C option
+Conflicts:  qubes-gui-daemon < 4.1.7
 
 %description
 This package include managemt tools, like qvm-*.