use sysusers everywhereHEADmaster

1 files changed, 0 insertions, 22 deletions

diff --git a/redis.spec b/redis.spec
index a3395e1..9c71e9e 100644
--- a/redis.spec
+++ b/redis.spec
@@ -18,12 +18,6 @@
 # Tests fail in mock, not in local build.
 %bcond_with    tests
 
-%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
-%bcond_without sysusers
-%else
-%bcond_with    sysusers
-%endif
-
 %global upstream_ver 8.0.3
 
 Name:              redis
@@ -69,12 +63,8 @@ Obsoletes:         redis-trib < 8
 Obsoletes:         redis-doc  < 8
 
 Requires:          logrotate
-%if %{with sysusers}
 %sysusers_requires_compat
 BuildRequires:     systemd-rpm-macros
-%else
-Requires(pre):     shadow-utils
-%endif
 Requires(post):    systemd
 Requires(preun):   systemd
 Requires(postun):  systemd
@@ -197,10 +187,8 @@ make %{?_smp_mflags} %{make_flags} all
 %install
 make %{make_flags} install
 
-%if %{with sysusers}
 # System user
 install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf
-%endif
 
 # Install tmpfiles.d file
 install -p -D -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
@@ -252,15 +240,7 @@ make %{make_flags} test-sentinel
 %endif
 
 %pre
-%if %{with sysusers}
 %sysusers_create_compat %{SOURCE4}
-%else
-getent group %{name} &> /dev/null || \
-groupadd -r %{name} &> /dev/null
-getent passwd %{name} &> /dev/null || \
-useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /sbin/nologin \
--c 'Redis Database Server' %{name} &> /dev/null
-%endif
 exit 0
 
 %if 0%{?fedora} < 34 && 0%{?rhel} < 9
@@ -335,9 +315,7 @@ fi
 %dir %{_sysconfdir}/systemd/system/%{name}.service.d
 %dir %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d
 %dir %attr(0755, redis, redis) %ghost %{_localstatedir}/run/%{name}
-%if %{with sysusers}
 %{_sysusersdir}/%{name}.conf
-%endif
 %{_tmpfilesdir}/%{name}.conf
 
 %files devel