Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package solanum for openSUSE:Factory checked 
in at 2024-02-04 19:09:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/solanum (Old)
 and      /work/SRC/openSUSE:Factory/.solanum.new.1815 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "solanum"

Sun Feb  4 19:09:06 2024 rev:6 rq:1143804 version:0~ch634

Changes:
--------
--- /work/SRC/openSUSE:Factory/solanum/solanum.changes  2023-07-25 
11:52:22.913901680 +0200
+++ /work/SRC/openSUSE:Factory/.solanum.new.1815/solanum.changes        
2024-02-04 19:11:14.609023494 +0100
@@ -1,0 +2,6 @@
+Sat Feb  3 12:52:43 UTC 2024 - Jan Engelhardt <[email protected]>
+
+- Emply %sysuser macros to generate "solanum" user
+  and have user(solanum) provided that way.
+
+-------------------------------------------------------------------

Old:
----
  solanum-sysusers.conf

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ solanum.spec ++++++
--- /var/tmp/diff_new_pack.euN6Yf/_old  2024-02-04 19:11:15.161043386 +0100
+++ /var/tmp/diff_new_pack.euN6Yf/_new  2024-02-04 19:11:15.161043386 +0100
@@ -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 @@
 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:  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 @@
 # 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 @@
 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

Reply via email to