summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--redis.spec29
2 files changed, 6 insertions, 25 deletions
diff --git a/Makefile b/Makefile
index 1e65467..91b0fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
-include ../common/Makefile
+include ../../common/Makefile
diff --git a/redis.spec b/redis.spec
index a3395e1..cf1896b 100644
--- a/redis.spec
+++ b/redis.spec
@@ -18,17 +18,11 @@
# 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
+%global upstream_ver 8.2.0
Name: redis
Version: %{upstream_ver}
-Release: 4%{?dist}
+Release: 1%{?dist}
Summary: A persistent key-value database
# redis: RSALv2 or SSPLv1 or AGPLv3 (only AGPLv3 is OSS)
# hiredis: BSD-3-Clause
@@ -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
@@ -347,6 +325,9 @@ fi
%changelog
+* Mon Aug 4 2025 Remi Collet <remi@remirepo.net> - 8.2.0-1
+- Redis 8.2 GA (v8.2.0) Released Mon 4 Aug 2025 15:00:00 IST
+
* Mon Jul 28 2025 Remi Collet <remi@remirepo.net> - 8.0.3-4
- add sysusers.d file for user management
- add tmpfiles.d file for temporary dir management