spampd.spec

@@ -1,9 +1,8 @@
 Summary: Transparent SMTP/LMTP proxy filter using spamassassin
 Name: spampd
 Version: 2.61
-Release: 13%{?dist}
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License: GPL-2.0-or-later
+Release: 4%{?dist}
+License: GPLv2+
 URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm
 Source0: https://github.com/mpaperno/spampd/archive/refs/tags/%{name}-%{version}.tar.gz
 Source1: spampd.service
@@ -19,6 +18,7 @@ BuildRequires: systemd-units
 
 Requires: perl(Net::Server)
 
+Requires(pre): /usr/sbin/useradd
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -37,16 +37,11 @@ indicating it's spam and why.
 
 %prep
 %setup -q
-%patch -P0 -p1 -b .no-pid-file
+%patch0 -p1 -b .no-pid-file
 %{__rm} -f spampd.html
 %{__chmod} -x changelog.txt
 %{__cp} %{SOURCE2} .
 
-# Create a sysusers.d config file
-cat >spampd.sysusers.conf <<EOF
-u spampd - - /var/spool/spampd -
-EOF
-
 
 %build
 pod2man spampd.pod spampd.8
@@ -70,10 +65,11 @@ pod2html --infile=spampd.pod --outfile=spampd.html
 # Home directory
 %{__mkdir_p} %{buildroot}/var/spool/spampd
 
-install -m0644 -D spampd.sysusers.conf %{buildroot}%{_sysusersdir}/spampd.conf
-
 
 
+%pre
+/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/spool/spampd \
+    spampd &>/dev/null || :
 
 %post
 %systemd_post spampd.service
@@ -91,37 +87,9 @@ install -m0644 -D spampd.sysusers.conf %{buildroot}%{_sysusersdir}/spampd.conf
 %{_sbindir}/spampd
 %{_mandir}/man8/spampd.8*
 %attr(0750,spampd,spampd) /var/spool/spampd
-%{_sysusersdir}/spampd.conf
 
 
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.61-12
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 2.61-10
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild