Skip to content

Commit 1f3b3be

Browse files
committed
Move qubes.WaitForSession to shared qrexec package
It is also used by dom0, to avoid duplication, merge into a single package. For: QubesOS/qubes-notification-proxy#13 For: QubesOS/qubes-gui-agent-linux#251 For: QubesOS/qubes-core-admin#757 For: QubesOS/qubes-issues#1512 For: QubesOS/qubes-issues#9940 Fixes: QubesOS/qubes-issues#10443
1 parent 1f542b7 commit 1f3b3be

File tree

5 files changed

+3
-17
lines changed

5 files changed

+3
-17
lines changed

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Depends:
4747
python3-gi,
4848
python3-qubesdb,
4949
python3-xdg,
50-
qubes-core-qrexec (>= 4.2.19),
50+
qubes-core-qrexec (>= 4.3.12),
5151
qubes-utils (>= 3.1.3),
5252
qubesdb-vm,
5353
systemd,

debian/qubes-core-agent.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ etc/qubes-rpc/qubes.VMRootShell
3737
etc/qubes-rpc/qubes.VMExec
3838
etc/qubes-rpc/qubes.VMExecGUI
3939
etc/qubes-rpc/qubes.VMRootExec
40-
etc/qubes-rpc/qubes.WaitForSession
4140
etc/qubes-rpc/qubes.WaitForRunningSystem
4241
etc/qubes-rpc/qubes.WaitForNetworkUplink
4342
etc/qubes-rpc/qubes.GetDate

qubes-rpc/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ install:
7878
qubes.SuspendPre qubes.SuspendPost qubes.GetAppmenus \
7979
qubes.SuspendPreAll \
8080
qubes.SuspendPostAll \
81-
qubes.WaitForSession \
8281
qubes.WaitForRunningSystem \
8382
qubes.WaitForNetworkUplink \
8483
qubes.DetachPciDevice \

qubes-rpc/qubes.WaitForSession

Lines changed: 0 additions & 13 deletions
This file was deleted.

rpm_spec/core-agent.spec.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ Requires: librsvg2-tools
153153
%endif
154154
Requires: zenity
155155
Requires: dconf
156+
Requires: qubes-core-qrexec >= 4.3.12
156157
Requires: qubes-core-qrexec-vm >= 4.2.19
157158
Requires: qubes-libvchan
158159
Requires: qubes-db-vm
@@ -183,6 +184,7 @@ Provides: qubes-core-vm = %{version}-%{release}
183184
Obsoletes: qubes-core-vm < 4.0.0
184185
Provides: qubes-core-vm-doc = %{version}-%{release}
185186
Obsoletes: qubes-core-vm-doc < 4.0.0
187+
Conflicts: qubes-core-qrexec < 4.3.12
186188
Conflicts: qubes-gui-agent < 4.1.6
187189
Conflicts: pulseaudio-qubes < 4.2.0
188190
Provides: group(qubes)
@@ -911,7 +913,6 @@ rm -f %{name}-%{version}
911913
%config(noreplace) /etc/qubes-rpc/qubes.SuspendPreAll
912914
%config(noreplace) /etc/qubes-rpc/qubes.SuspendPost
913915
%config(noreplace) /etc/qubes-rpc/qubes.SuspendPostAll
914-
%config(noreplace) /etc/qubes-rpc/qubes.WaitForSession
915916
%config(noreplace) /etc/qubes-rpc/qubes.WaitForRunningSystem
916917
%config(noreplace) /etc/qubes-rpc/qubes.WaitForNetworkUplink
917918
%config(noreplace) /etc/qubes-rpc/qubes.DetachPciDevice

0 commit comments

Comments
 (0)