Browse Source

Adjust version of required qubes-gui-agent

The "qubes-sysinit: set GUI_OPTS in gui-agent-linux" commit breaks
gui-agent-linux lacking its counterpart. Express this in the package
metadata.

QubesOS/qubes-issues#5662
Marek Marczykowski-Górecki 4 năm trước cách đây
mục cha
commit
731a87f292
2 tập tin đã thay đổi với 2 bổ sung2 xóa
  1. 1 1
      debian/control
  2. 1 1
      rpm_spec/core-agent.spec.in

+ 1 - 1
debian/control

@@ -79,7 +79,7 @@ Conflicts:
     qubes-core-agent-linux,
     qubes-core-agent-linux,
     firewalld,
     firewalld,
     qubes-core-vm-sysvinit,
     qubes-core-vm-sysvinit,
-    qubes-gui-agent (<< 4.1.0-1)
+    qubes-gui-agent (<< 4.1.6-1)
 Description: Qubes core agent
 Description: Qubes core agent
  This package includes various daemons necessary for qubes domU support,
  This package includes various daemons necessary for qubes domU support,
  such as qrexec services.
  such as qrexec services.

+ 1 - 1
rpm_spec/core-agent.spec.in

@@ -145,7 +145,7 @@ Provides:   qubes-core-vm = %{version}-%{release}
 Obsoletes:  qubes-core-vm < 4.0.0
 Obsoletes:  qubes-core-vm < 4.0.0
 Provides:	qubes-core-vm-doc = %{version}-%{release}
 Provides:	qubes-core-vm-doc = %{version}-%{release}
 Obsoletes:	qubes-core-vm-doc < 4.0.0
 Obsoletes:	qubes-core-vm-doc < 4.0.0
-Conflicts:	qubes-gui-agent < 4.1.0
+Conflicts:	qubes-gui-agent < 4.1.6
 BuildRequires: gcc
 BuildRequires: gcc
 BuildRequires: pandoc
 BuildRequires: pandoc
 BuildRequires: xen-devel
 BuildRequires: xen-devel