Merge pull request #677 from arnaldo2792/provide-dbus-launcher

Provide dbus-launcher as its own package

Author: arnaldo2792

packages/dbus-broker/0002-meson.build-remove-condition-to-build-the-journal-ca.patch

@@ -0,0 +1,64 @@
+From 819952f36db9a27e3dff5c9db7344992263d111d Mon Sep 17 00:00:00 2001
+From: Arnaldo Garcia Rincon <[email protected]>
+Date: Thu, 18 Sep 2025 01:55:32 +0000
+Subject: [PATCH] meson.build: remove condition to build the journal catalog
+
+Don't require the dbus-launcher to build the journal catalog
+
+Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
+---
+ meson.build       | 6 +++++-
+ meson_options.txt | 1 +
+ src/meson.build   | 2 +-
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 72e2b47..625c552 100644
+--- a/meson.build
++++ b/meson.build
+@@ -67,6 +67,11 @@ if use_docs
+ endif
+ 
+ #
++# Config: catalog (needed for both broker and launcher)
++#
++
++conf.set('catalogdir', get_option('catalogdir'))
++
+ # Config: launcher
+ #
+ 
+@@ -79,7 +84,6 @@ if use_launcher
+         add_project_arguments('-DSYSTEMUIDMAX=' + dep_systemd.get_variable('systemuidmax'), language: 'c')
+         conf.set('systemunitdir', dep_systemd.get_variable('systemdsystemunitdir'))
+         conf.set('userunitdir', dep_systemd.get_variable('systemduserunitdir'))
+-        conf.set('catalogdir', dep_systemd.get_variable('catalogdir'))
+ endif
+ 
+ #
+diff --git a/meson_options.txt b/meson_options.txt
+index 5227a93..bfc898c 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -7,3 +7,4 @@ option('reference-test', type: 'boolean', value: false, description: 'Run test s
+ option('selinux', type: 'boolean', value: false, description: 'SELinux support')
+ option('system-console-users', type: 'array', value: [], description: 'Additional set of names of system-users to be considered at-console')
+ option('tests', type: 'boolean', value: false, description: 'Include tests in the distribution')
++option('catalogdir', type: 'string', description: 'The target directory of the catalogdir')
+diff --git a/src/meson.build b/src/meson.build
+index 4b9bc71..33fc7f7 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -2,8 +2,8 @@
+ # target: subdirs
+ #
+ 
++subdir('catalog')
+ if use_launcher
+-        subdir('catalog')
+         subdir('units/system')
+         subdir('units/user')
+ endif
+-- 
+2.50.1
+

packages/dbus-broker/dbus-broker.spec

@@ -21,13 +21,25 @@ BuildRequires: %{_cross_os}systemd-devel
 Requires: %{_cross_os}libexpat
 Requires: %{_cross_os}libselinux
 Requires: %{_cross_os}systemd
+Requires: %{_cross_os}dbus-broker(launcher)
 
 # Work around an aliasing rules violation.
 Patch0001: 0001-c-utf8-disable-strict-aliasing-optimizations.patch
+# Allow building the journal catalogs when dbus-launcher is excluded
+Patch0002: 0002-meson.build-remove-condition-to-build-the-journal-ca.patch
 
 %description
 %{summary}.
 
+%package launcher
+Summary: Launcher for the D-BUS message broker
+Provides: %{_cross_os}dbus-broker(launcher) = 1:
+Conflicts: %{_cross_os}dbus-broker(launcher)
+Requires: %{name}
+
+%description launcher
+%{summary}.
+
 %prep
 %{gpgverify} --data=%{S:0} --signature=%{S:1} --keyring=%{S:2}
 %autosetup -n dbus-broker-%{version} -p1
@@ -39,6 +51,7 @@ CONFIGURE_OPTS=(
  -Ddocs=false
  -Dlauncher=true
  -Dselinux=true
+ -Dcatalogdir=%{_cross_journalcatalogdir}
 )
 
 %cross_meson "${CONFIGURE_OPTS[@]}"
@@ -60,14 +73,16 @@ install -p -m 0644 %{S:13} %{buildroot}%{_cross_sysusersdir}/dbus.conf
 %license LICENSE
 %{_cross_attribution_file}
 %{_cross_bindir}/dbus-broker
-%{_cross_bindir}/dbus-broker-launch
 %dir %{_cross_datadir}/dbus-1
-%{_cross_datadir}/dbus-1/*
 %{_cross_journalcatalogdir}/dbus-broker.catalog
-%{_cross_journalcatalogdir}/dbus-broker-launch.catalog
 %{_cross_sysusersdir}/dbus.conf
-%{_cross_unitdir}/dbus-broker.service
 %{_cross_unitdir}/dbus.socket
 %exclude %{_cross_userunitdir}/dbus-broker.service
 
+%files launcher
+%{_cross_bindir}/dbus-broker-launch
+%{_cross_journalcatalogdir}/dbus-broker-launch.catalog
+%{_cross_datadir}/dbus-1/system.conf
+%{_cross_unitdir}/dbus-broker.service
+
 %changelog