Accepting request 1143804 from server:irc

- Emply %sysuser macros to generate "solanum" user
  and have user(solanum) provided that way.

OBS-URL: https://build.opensuse.org/request/show/1143804
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/solanum?expand=0&rev=6

solanum.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Feb  3 12:52:43 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Emply %sysuser macros to generate "solanum" user
+  and have user(solanum) provided that way.
+
 -------------------------------------------------------------------
 Sun Jul 23 19:31:34 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 

solanum.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package solanum
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,6 @@ Group:          Productivity/Networking/IRC
 URL:            https://github.com/solanum-ircd/solanum
 
 Source:         %name-%version.tar.xz
-Source1:        %name-sysusers.conf
 Source9:        example.conf
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -35,10 +34,11 @@ BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  sqlite3-devel
 BuildRequires:  systemd-rpm-macros
+BuildRequires:  sysuser-tools
 BuildRequires:  pkgconfig(libcrypto) >= 0.9.7
 BuildRequires:  pkgconfig(libssl) >= 0.9.7
 BuildRequires:  pkgconfig(zlib)
-Requires(pre):  shadow
+%sysusers_requires
 Obsoletes:      charybdis
 
 %description
@@ -68,8 +68,6 @@ mv "$b/%_sysconfdir/%name"/*.conf "$b/%_datadir/%name/"
 # Place some config file that will make it run out of the box on localhost
 cp "%{S:9}" "$b/%_sysconfdir/%name/ircd.conf"
 
-install -D %SOURCE1 %{buildroot}%{_sysusersdir}/%name.conf
-
 mkdir -p "$b/%_localstatedir/lib/solanum" \
 	"$b/%_localstatedir/log/solanum" "$b/%_sbindir" \
 	"$b/%_unitdir" "$b/%_sysusersdir" "$b/%_tmpfilesdir"
@@ -86,11 +84,13 @@ EOF
 cat >"$b/%_tmpfilesdir/solanum.conf" <<-EOF
 	d /run/%name 0755 solanum solanum -
 EOF
+echo 'u solanum - "Solanum ircd"' >system-user-solanum.conf
+cp -a system-user-solanum.conf "$b/%_sysusersdir/"
+%sysusers_generate_pre system-user-solanum.conf random system-user-solanum.conf
 # There are no headers installed, so the .pc and devel .so is useless
 rm -Rf "$b/%_libdir/pkgconfig" "$b/%_libdir/libratbox.so"
 
-%pre
-%sysusers_create_package %name %SOURCE1
+%pre -f random.pre
 %service_add_pre %name.service
 
 %post

solanum-sysusers.conf

@@ -1 +0,0 @@
-u solanum - "Solanum ircd"