Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/redis.git#ee62a9b3823ca4d682ef336d342a69a873657c1b
This commit is contained in:
DistroBaker 2020-11-24 08:41:53 +00:00
parent 617715f9da
commit 42907af844

View File

@ -20,7 +20,7 @@
Name: redis Name: redis
Version: 6.0.9 Version: 6.0.9
Release: 2%{?dist} Release: 3%{?dist}
Summary: A persistent key-value database Summary: A persistent key-value database
# redis, jemalloc, linenoise, lzf, hiredis are BSD # redis, jemalloc, linenoise, lzf, hiredis are BSD
# lua is MIT # lua is MIT
@ -225,7 +225,7 @@ useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /sbin/nologin \
exit 0 exit 0
%post %post
if [ -f %{_sysconfdir}/%{name}.conf ]; then if [ -f %{_sysconfdir}/%{name}.conf -a ! -L %{_sysconfdir}/%{name}.conf ]; then
if [ -f %{_sysconfdir}/%{name}/%{name}.conf.rpmnew ]; then if [ -f %{_sysconfdir}/%{name}/%{name}.conf.rpmnew ]; then
rm %{_sysconfdir}/%{name}/%{name}.conf.rpmnew rm %{_sysconfdir}/%{name}/%{name}.conf.rpmnew
fi fi
@ -235,7 +235,7 @@ if [ -f %{_sysconfdir}/%{name}.conf ]; then
mv %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}/%{name}.conf mv %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}/%{name}.conf
echo -e "\nWarning: %{name} configuration is now in %{_sysconfdir}/%{name} directory\n" echo -e "\nWarning: %{name} configuration is now in %{_sysconfdir}/%{name} directory\n"
fi fi
if [ -f %{_sysconfdir}/%{name}-sentinel.conf ]; then if [ -f %{_sysconfdir}/%{name}-sentinel.conf -a ! -L %{_sysconfdir}/%{name}-sentinel.conf ]; then
if [ -f %{_sysconfdir}/%{name}/sentinel.conf.rpmnew ]; then if [ -f %{_sysconfdir}/%{name}/sentinel.conf.rpmnew ]; then
rm %{_sysconfdir}/%{name}/sentinel.conf.rpmnew rm %{_sysconfdir}/%{name}/sentinel.conf.rpmnew
fi fi
@ -298,6 +298,9 @@ fi
%changelog %changelog
* Tue Nov 24 2020 Remi Collet <remi@remirepo.net> - 6.0.9-3
- fix check for regular file, not symlink
* Mon Nov 23 2020 Remi Collet <remi@remirepo.net> - 6.0.9-2 * Mon Nov 23 2020 Remi Collet <remi@remirepo.net> - 6.0.9-2
- move configuration in /etc/redis per upstream recommendation - move configuration in /etc/redis per upstream recommendation
see https://github.com/redis/redis/issues/8051 see https://github.com/redis/redis/issues/8051