Browse Source

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
Marek Marczykowski-Górecki 4 years ago
parent
commit
4cc9ae5a1d
2 changed files with 7 additions and 1 deletions
  1. 5 1
      debian/control
  2. 2 0
      rpm_spec/core-agent.spec.in

+ 5 - 1
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.

+ 2 - 0
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.