diff --git a/.gitignore b/.gitignore index ab12885..9bed2c3 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,5 @@ clog /redis-6.2.6.tar.gz /redis-doc-3fdb6df.tar.gz /redis-6.2.7.tar.gz +/redis-7.0.0.tar.gz +/redis-doc-a14b449.tar.gz diff --git a/redis.spec b/redis.spec index 76807e1..284426e 100644 --- a/redis.spec +++ b/redis.spec @@ -15,14 +15,14 @@ # Commit IDs for the (unversioned) redis-doc repository # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision" -%global doc_commit 3fdb6df44ecd5c4d99ea52a0133177f5ebc24805 +%global doc_commit a14b449a95b12874085a1dde6df0cf066d7548b6 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7}) # %%{rpmmacrodir} not usable on EL-6 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: redis -Version: 6.2.7 +Version: 7.0.0 Release: 1%{?dist} Summary: A persistent key-value database # redis, jemalloc, linenoise, lzf, hiredis are BSD @@ -68,12 +68,14 @@ Requires(postun): systemd # from deps/hiredis/hiredis.h Provides: bundled(hiredis) = 0.14.0 # from deps/jemalloc/VERSION -Provides: bundled(jemalloc) = 5.1.0 +Provides: bundled(jemalloc) = 5.2.1 # from deps/lua/src/lua.h Provides: bundled(lua-libs) = 5.1.5 # from deps/linenoise/linenoise.h Provides: bundled(linenoise) = 1.0 Provides: bundled(lzf) +# from deps/hdr_histogram/README.md +Provides: bundled(hdr_histogram) = 0.11.0 %global redis_modules_abi 1 %global redis_modules_dir %{_libdir}/%{name}/modules @@ -135,6 +137,8 @@ mv ../%{name}-doc-%{doc_commit} doc mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/jemalloc/COPYING COPYING-jemalloc mv deps/hiredis/COPYING COPYING-hiredis +mv deps/hdr_histogram/LICENSE.txt LICENSE-hdrhistogram +mv deps/hdr_histogram/COPYING.txt COPYING-hdrhistogram # Configuration file changes sed -i -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' redis.conf @@ -262,6 +266,8 @@ fi %license COPYRIGHT-lua %license COPYING-jemalloc %license COPYING-hiredis +%license LICENSE-hdrhistogram +%license COPYING-hdrhistogram %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %attr(0750, redis, root) %dir %{_sysconfdir}/%{name} %attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf @@ -299,6 +305,9 @@ fi %changelog +* Thu Apr 28 2022 Remi Collet - 7.0.0-1 +- Upstream 7.0.0 release. + * Thu Apr 28 2022 Remi Collet - 6.2.7-1 - Upstream 6.2.7 release. diff --git a/sources b/sources index 46ccfdc..c266dc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (redis-6.2.7.tar.gz) = d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953 -SHA512 (redis-doc-3fdb6df.tar.gz) = 9444a3dc45075febeb2823b415997c2d5e512558aba12aca1b63db941c81d79050595b7feb553a45349cbdb34ff097a67b925fd542a582d8ca5ba9f0a8e9a638 +SHA512 (redis-7.0.0.tar.gz) = 12ac925708c54b00b34c365dee39cb207fbe3cb3c99e8daad965e122b6e3a6543e3ca80e23e6a56f5dff6371d4f2b9c149ee51800ed540e1f1b9154a118ea07b +SHA512 (redis-doc-a14b449.tar.gz) = 9e4c84507d5f0ad9a681c35bd1d7b2fdd164db945e98bb5ba1261a898aaf4ebc601ee562b506fe16ec610fd15c784d8ce58fb0ca1f10896b55e6edcf19ad7b11