From 72b9f389b2d0a91a8a7d5f8472af0aa04fbc501a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 29 May 2017 03:40:33 +0200
Subject: [PATCH] Split dom0-updates handling into subpackage

In Fedora it makes little sense, but in Debian it allows to avoid a lot
of dependencies. So split in both, to keep it simple.

QubesOS/qubes-issues#2771
---
 debian/control                               | 16 +++++++++++----
 debian/qubes-core-agent-dom0-updates.install |  1 +
 debian/qubes-core-agent.install              |  1 -
 rpm_spec/core-agent.spec                     | 21 ++++++++++++++------
 4 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 debian/qubes-core-agent-dom0-updates.install

diff --git a/debian/control b/debian/control
index a7e98e7..e95c591 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,6 @@ Architecture: any
 Depends:
     dmsetup,
     ethtool,
-    fakeroot,
     gawk,
     imagemagick,
     init-system-helpers,
@@ -73,9 +72,7 @@ Recommends:
     system-config-printer,
     tinyproxy,
     qubes-nautilus,
-    xsettingsd,
-    yum,
-    yum-utils
+    xsettingsd
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}, qubes-core-agent-linux, firewalld, qubes-core-vm-sysvinit
 Description: Qubes core agent
@@ -88,3 +85,14 @@ Description: Qubes integration for Nautilus
  Nautilus addons for inter-VM file copy/move/open.
 Depends:
     python-nautilus,
+
+Package: qubes-core-agent-dom0-updates
+Architecture: any
+Depends:
+    fakeroot,
+    yum,
+    yum-utils
+Description: Scripts required to handle dom0 updates.
+  Scripts required to handle dom0 updates. This will allow to use the VM as
+  "Updates VM".
+
diff --git a/debian/qubes-core-agent-dom0-updates.install b/debian/qubes-core-agent-dom0-updates.install
new file mode 100644
index 0000000..3d7d578
--- /dev/null
+++ b/debian/qubes-core-agent-dom0-updates.install
@@ -0,0 +1 @@
+usr/lib/qubes/qubes-download-dom0-updates.sh
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 1ca224c..aab132c 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -138,7 +138,6 @@ usr/lib/qubes/qrexec-agent
 usr/lib/qubes/qrexec-client-vm
 usr/lib/qubes/qrexec_client_vm
 usr/lib/qubes/qrun-in-vm
-usr/lib/qubes/qubes-download-dom0-updates.sh
 usr/lib/qubes/qubes-fix-nm-conf.sh
 usr/lib/qubes/qubes-rpc-multiplexer
 usr/lib/qubes/qubes-setup-dnat-to-ns
diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec
index c341228..dc3398b 100644
--- a/rpm_spec/core-agent.spec
+++ b/rpm_spec/core-agent.spec
@@ -145,7 +145,6 @@ Requires:   python2-qubesdb
 Requires:   nftables
 Requires:   ImageMagick
 Requires:   librsvg2-tools
-Requires:   fakeroot
 Requires:   desktop-notification-daemon
 # to show/hide nm-applet
 Requires:   dconf
@@ -166,6 +165,9 @@ BuildRequires: libX11-devel
 BuildRequires: qubes-utils-devel >= 3.1.3
 BuildRequires: qubes-libvchan-%{backend_vmm}-devel
 
+%description
+The Qubes core files for installation inside a Qubes VM.
+
 %package -n python2-dnf-plugins-qubes-hooks
 Summary:	DNF plugin for Qubes specific post-installation actions
 BuildRequires: python2-devel
@@ -194,13 +196,18 @@ Requires:   nautilus-python
 %description nautilus
 Nautilus addons for inter-VM file copy/move/open.
 
+%package dom0-updates
+Summary:    Scripts required to handle dom0 updates
+Requires:   qubes-core-agent
+Requires:   fakeroot
+
+%description dom0-updates
+Scripts required to handle dom0 updates.
+
 %define _builddir %(pwd)
 
 %define kde_service_dir /usr/share/kde4/services
 
-%description
-The Qubes core files for installation inside a Qubes VM.
-
 %prep
 # we operate on the current directory, so no need to unpack anything
 # symlink is to generate useful debuginfo packages
@@ -411,7 +418,6 @@ rm -f %{name}-%{version}
 %defattr(-,root,root,-)
 %dir /var/lib/qubes
 %dir /var/run/qubes
-%dir %attr(0775,user,user) /var/lib/qubes/dom0-updates
 %{kde_service_dir}/qvm-copy.desktop
 %{kde_service_dir}/qvm-move.desktop
 %{kde_service_dir}/qvm-dvm.desktop
@@ -506,7 +512,6 @@ rm -f %{name}-%{version}
 %attr(4755,root,root) /usr/lib/qubes/qfile-unpacker
 /usr/lib/qubes/qopen-in-vm
 /usr/lib/qubes/qrun-in-vm
-/usr/lib/qubes/qubes-download-dom0-updates.sh
 /usr/lib/qubes/qubes-fix-nm-conf.sh
 /usr/lib/qubes/qubes-setup-dnat-to-ns
 /usr/lib/qubes/qubes-trigger-sync-appmenus.sh
@@ -564,6 +569,10 @@ rm -f %{name}-%{version}
 /usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
 /usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*
 
+%files dom0-updates
+%dir %attr(0775,user,user) /var/lib/qubes/dom0-updates
+/usr/lib/qubes/qubes-download-dom0-updates.sh
+
 %package sysvinit
 Summary:        Qubes unit files for SysV init style or upstart
 License:        GPL v2 only