From 8d38ba4971d7739656747fd99cc0228cb7c1d6e5 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Thu, 18 Jan 2024 11:36:08 +0000
Subject: [PATCH] Use upstream sysusers configuration

Additionally, simplify vendor.conf installation. Drop unnecessary
gnome-desktop4 Requires.
---
 gnome-initial-setup.spec | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index b0bc6d3..f88cd42 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -58,7 +58,8 @@ BuildRequires:  pkgconfig(rest-1.0)
 %if %{with webkitgtk}
 BuildRequires:  pkgconfig(webkitgtk-6.0)
 %endif
-BuildRequires:  gnome-desktop4 >= %{gnome_desktop_version}
+BuildRequires:  systemd-rpm-macros
+%{?sysusers_requires_compat}
 
 # gnome-initial-setup is being run by gdm
 Requires: gdm
@@ -69,10 +70,6 @@ Requires: gnome-desktop4%{?_isa} >= %{gnome_desktop_version}
 Requires: polkit-js-engine
 Requires: /usr/bin/tecla
 
-Requires(pre): shadow-utils
-
-Provides: user(%name)
-
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch: %{ix86}
 
@@ -99,13 +96,12 @@ you through configuring it. It is integrated with gdm.
 desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
 desktop-file-validate %{buildroot}%{_datadir}/applications/gnome-initial-setup.desktop
 
-mkdir -p %{buildroot}%{_datadir}/gnome-initial-setup
-cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/
+install -pDm 0644 %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/
 
 %find_lang %{name}
 
 %pre
-useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || :
+%sysusers_create_compat %{buildroot}/%{_sysusersdir}/%{name}.conf
 
 %files -f %{name}.lang
 %license COPYING