From 357aa54d6fb2649b0c962a1e451aeab7f2baf549eb32793f125e90fe979a6b3b Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 24 Nov 2021 08:38:49 +0000
Subject: [PATCH] Accepting request 932654 from home:gmbr3:Active

sysusers

OBS-URL: https://build.opensuse.org/request/show/932654
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=307
---
 dbus-1-x11.spec | 3 ++-
 dbus-1.changes  | 5 +++++
 dbus-1.spec     | 5 ++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec
index 0d80530..407ab6f 100644
--- a/dbus-1-x11.spec
+++ b/dbus-1-x11.spec
@@ -124,8 +124,9 @@ EOF
 # removing old update-alternatives entries
 if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
     %{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.x11
-fi    
+fi
 %else
+
 %post
 %{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch %{_bindir}/dbus-launch.x11 20
 
diff --git a/dbus-1.changes b/dbus-1.changes
index 991d305..86e0c7f 100644
--- a/dbus-1.changes
+++ b/dbus-1.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  8 16:42:10 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Add CONFIG parameter to %sysusers_generate_pre
+
 -------------------------------------------------------------------
 Thu Sep 23 15:41:27 UTC 2021 - Stefan Schubert <schubi@suse.de>
 
diff --git a/dbus-1.spec b/dbus-1.spec
index 5e31f80..d167547 100644
--- a/dbus-1.spec
+++ b/dbus-1.spec
@@ -49,7 +49,6 @@ BuildRequires:  libcap-ng-devel
 BuildRequires:  libexpat-devel >= 2.1.0
 BuildRequires:  permissions
 BuildRequires:  pkgconfig
-BuildRequires:  sysuser-shadow
 BuildRequires:  sysuser-tools
 BuildRequires:  xmlto
 BuildRequires:  pkgconfig(libsystemd) >= 209
@@ -135,7 +134,7 @@ export V=1
 # The original dbus sysusers config does not create our account,
 # overwrite it with our user definition
 cp %{SOURCE5} bus/sysusers.d/dbus.conf
-%sysusers_generate_pre %{SOURCE5} messagebus
+%sysusers_generate_pre %{SOURCE5} messagebus dbus.conf
 
 %check
 %make_build check
@@ -202,7 +201,7 @@ rm -Rf %{buildroot}%{_datadir}/doc/dbus
 # removing old update-alternatives entries
 if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
     %{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.nox11
-fi    
+fi
 %endif
 
 %post