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.
QubesOS · Jul 15, 2020 · 6182c5c · 6182c5c
1 parent 6f33580
commit 6182c5c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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-*.