diff options
| -rw-r--r-- | redis.spec | 22 |
1 files changed, 15 insertions, 7 deletions
@@ -25,9 +25,9 @@ %bcond_with tests # Pre-version are only available in github -%global upstream_ver 7.0.10 -#global upstream_pre RC3 -%global gh_commit 5921ba4cdef2761bfed34b982368f1fe077d03e9 +%global upstream_ver 7.2 +%global upstream_pre RC1 +%global gh_commit e26a769d9627ebecb8607375580970a740348956 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner redis %global gh_project redis @@ -49,7 +49,8 @@ Group: Applications/Databases # redis, hiredis: BSD-3-Clause # hdrhistogram, jemalloc, lzf, linenoise: BSD-2-Clause # lua: MIT -License: BSD-3-Clause AND BSD-2-Clause AND MIT +# fpconv: BSL-1.0 +License: BSD-3-Clause AND BSD-2-Clause AND MIT AND BSL-1.0 URL: http://redis.io %if 0%{?upstream_pre:1} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{upstream_ver}%{upstream_pre}-%{gh_short}.tar.gz @@ -105,7 +106,7 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd # from deps/hiredis/hiredis.h -Provides: bundled(hiredis) = 1.0.0 +Provides: bundled(hiredis) = 1.0.3 # from deps/lua/src/lua.h Provides: bundled(lua-libs) = 5.1.5 # from deps/linenoise/linenoise.h @@ -113,6 +114,8 @@ Provides: bundled(linenoise) = 1.0 Provides: bundled(lzf) # from deps/hdr_histogram/README.md Provides: bundled(hdr_histogram) = 0.11.0 +# no version +Provides: bundled(fpconv) %global redis_modules_abi 1 %global redis_modules_dir %{_libdir}/%{name}/modules @@ -194,10 +197,11 @@ sed -i -e 's|-I../deps/jemalloc.*|-DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc %else mv deps/jemalloc/COPYING COPYING-jemalloc %endif -mv deps/lua/COPYRIGHT COPYRIGHT-lua -mv deps/hiredis/COPYING COPYING-hiredis +mv deps/lua/COPYRIGHT COPYRIGHT-lua +mv deps/hiredis/COPYING COPYING-hiredis mv deps/hdr_histogram/LICENSE.txt LICENSE-hdrhistogram mv deps/hdr_histogram/COPYING.txt COPYING-hdrhistogram +mv deps/fpconv/LICENSE.txt LICENSE-fpconv # Configuration file changes sed -i -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' redis.conf @@ -367,6 +371,7 @@ fi %license COPYING-hiredis %license LICENSE-hdrhistogram %license COPYING-hdrhistogram +%license LICENSE-fpconv %if %{without jemalloc} %license COPYING-jemalloc %endif @@ -414,6 +419,9 @@ fi %changelog +* Thu Mar 23 2023 Remi Collet <remi@remirepo.net> - 7.2~RC1-1 +- Redis 7.2 RC1 (7.1.240) Released Wed Mar 22 12:00:00 IST 2023 + * Tue Mar 21 2023 Remi Collet <remi@remirepo.net> - 7.0.10-1 - Redis 7.0.10 Released Mon Mar 20 16:00:00 IST 2023 - Upgrade urgency: SECURITY, contains fixes to security issues. |