diff --git a/sanlock.spec b/sanlock.spec index e046f22..e68d2b6 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -1,6 +1,6 @@ Name: sanlock Version: 3.9.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A shared storage lock manager License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later URL: https://pagure.io/sanlock/ @@ -10,8 +10,6 @@ BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: make BuildRequires: systemd-units -BuildRequires: systemd-rpm-macros -%{?sysusers_requires_compat} Requires: %{name}-lib = %{version}-%{release} Requires(post): systemd-units Requires(post): systemd-sysv @@ -64,7 +62,15 @@ install -D -m 0644 init.d/wdmd.sysconfig \ install -Dd -m 0755 $RPM_BUILD_ROOT/etc/wdmd.d %pre -%sysusers_create_compat src/sanlock.sysusers +# As libvirt does, install a sysusers file, but also directly +# create the user and group to avoid rpm installation errors +# (sysusers rpm macros seem to be insufficient to avoid problems.) +getent group sanlock > /dev/null || /usr/sbin/groupadd \ + -g 179 sanlock +getent passwd sanlock > /dev/null || /usr/sbin/useradd \ + -u 179 -c "sanlock" -s /sbin/nologin -r \ + -g 179 -d /run/sanlock sanlock +/usr/sbin/usermod -a -G disk sanlock %post %systemd_post wdmd.service sanlock.service @@ -128,6 +134,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/libsanlock_client.pc %changelog +* Wed Jan 08 2025 David Teigland - 3.9.5-4 +- restore useradd and groupadd in place of sysusers rpm macros + * Tue Oct 29 2024 Troy Dawson - 3.9.5-3 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018