From 9fcd6a1e1966b40b5eb36a570a9b9e120760e85f Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Thu, 17 Dec 2020 16:22:40 +0100
Subject: [PATCH] spec/core: introduce new sub-package

This package is init-system independent and can be used in a container
without systemd/worker installed.
---
 osbuild-composer.spec | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 5c8c34e83..536a8877e 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -56,6 +56,7 @@ BuildRequires:  golang(github.com/ubccr/kerby)
 BuildRequires:  golang(github.com/vmware/govmomi)
 %endif
 
+Requires: %{name}-core = %{version}-%{release}
 Requires: %{name}-worker = %{version}-%{release}
 Requires: systemd
 
@@ -246,9 +247,6 @@ cd $PWD/_build/src/%{goipath}
 %license LICENSE
 %doc README.md
 %{_mandir}/man7/%{name}.7*
-%{_libexecdir}/osbuild-composer/osbuild-composer
-%{_libexecdir}/osbuild-composer/dnf-json
-%{_datadir}/osbuild-composer/
 %{_unitdir}/osbuild-composer.service
 %{_unitdir}/osbuild-composer.socket
 %{_unitdir}/osbuild-composer-api.socket
@@ -256,6 +254,17 @@ cd $PWD/_build/src/%{goipath}
 %{_unitdir}/osbuild-remote-worker.socket
 %{_sysusersdir}/osbuild-composer.conf
 
+%package core
+Summary:    The core osbuild-composer binary
+
+%description core
+The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd.
+
+%files core
+%{_libexecdir}/osbuild-composer/osbuild-composer
+%{_libexecdir}/osbuild-composer/dnf-json
+%{_datadir}/osbuild-composer/
+
 %package worker
 Summary:    The worker for osbuild-composer
 Requires:   systemd