From 3fe42d4a27934dc43f8ffb0ce61c078164263e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 13 Nov 2018 03:42:24 +0100
Subject: [PATCH] rpm, deb: add strict version dependency between
 qubes-core-agent-* pkgs

Base qubes-core-agent package have common files used by various
subpackages. It is important to update them at the same time, otherwise
for example python stubs in /usr/bin/* (like qubes-firewall) will not
match actual python modules.

Fixes QubesOS/qubes-issues#4499
---
 debian/control              |  4 ++--
 rpm_spec/core-agent.spec.in | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index a877e9e..ab7afdc 100644
--- a/debian/control
+++ b/debian/control
@@ -125,7 +125,7 @@ Description: Scripts required to handle dom0 updates.
 Package: qubes-core-agent-networking
 Architecture: any
 Depends:
-    qubes-core-agent,
+    qubes-core-agent (= ${binary:Version}),
     tinyproxy,
     iptables,
     net-tools,
@@ -151,7 +151,7 @@ Description: Networking support for Qubes VM
 Package: qubes-core-agent-network-manager
 Architecture: any
 Depends:
-    qubes-core-agent-networking,
+    qubes-core-agent-networking (= ${binary:Version}),
     libglib2.0-bin,
     network-manager (>= 0.8.1-1),
     network-manager-gnome,
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 41c0b87..7288aa5 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -196,7 +196,7 @@ requested by dom0 or other VMs, according to dom0-enforced policy.
 
 %package nautilus
 Summary:    Qubes integration for Nautilus
-Requires:   qubes-core-agent
+Requires:   qubes-core-agent = %{version}
 Requires:   nautilus-python
 Conflicts:  qubes-core-vm < 4.0.0
 
@@ -205,7 +205,7 @@ Nautilus addons for inter-VM file copy/move/open.
 
 %package dom0-updates
 Summary:    Scripts required to handle dom0 updates
-Requires:   qubes-core-agent
+Requires:   qubes-core-agent = %{version}
 Requires:   fakeroot
 Conflicts:  qubes-core-vm < 4.0.0
 Requires:   tar
@@ -220,7 +220,7 @@ Requires:   iptables
 Requires:   net-tools
 Requires:   nftables
 Requires:   socat
-Requires:   qubes-core-agent
+Requires:   qubes-core-agent = %{version}
 Requires:   tinyproxy
 Conflicts:  qubes-core-vm < 4.0.0
 
@@ -238,7 +238,7 @@ Summary:    NetworkManager integration for Qubes VM
 # to show/hide nm-applet
 Requires:   NetworkManager >= 0.8.1-1
 Requires:   glib2
-Requires:   qubes-core-agent-networking
+Requires:   qubes-core-agent-networking = %{version}
 Conflicts:  qubes-core-vm < 4.0.0
 
 %description network-manager
@@ -767,9 +767,9 @@ Summary:        Qubes unit files for SysV init style or upstart
 License:        GPL v2 only
 Group:          Qubes
 Requires:       upstart
-Requires:       qubes-core-agent
-Requires:       qubes-core-agent-qrexec
-Requires:       qubes-core-agent-networking
+Requires:       qubes-core-agent = %{version}
+Requires:       qubes-core-agent-qrexec = %{version}
+Requires:       qubes-core-agent-networking = %{version}
 Provides:       qubes-core-agent-init-scripts
 Conflicts:      qubes-core-agent-systemd
 Provides:       qubes-core-vm-sysvinit = %{version}-%{release}
@@ -837,7 +837,7 @@ Requires:       systemd
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-Requires:       qubes-core-agent
+Requires:       qubes-core-agent = %{version}
 Provides:       qubes-core-agent-init-scripts
 Conflicts:      qubes-core-agent-sysvinit
 Provides:       qubes-core-vm-systemd = %{version}-%{release}