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#26adbf872b0e65b55b01494c9723cc5ec659ccd4

.gitignore

@@ -78,3 +78,5 @@ clog
 /redis-doc-2c335a8.tar.gz
 /redis-6.0.8.tar.gz
 /redis-doc-25555fe.tar.gz
+/redis-6.0.9.tar.gz
+/redis-doc-8d4bf9b.tar.gz

redis.spec

@@ -12,17 +12,17 @@
 
 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
-%global doc_commit 25555fe05a571454fa0f11dca28cb5796e04112f
+%global doc_commit 8d4bf9bc476829a84a055c049be72634d6e938df
 %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.0.8
+Version:           6.0.9
 Release:           1%{?dist}
 Summary:           A persistent key-value database
-# redis, linenoise, lzf, hiredis are BSD
+# redis, jemalloc, linenoise, lzf, hiredis are BSD
 # lua is MIT
 License:           BSD and MIT
 URL:               https://redis.io
@@ -66,10 +66,14 @@ Requires(pre):     shadow-utils
 Requires(post):    systemd
 Requires(preun):   systemd
 Requires(postun):  systemd
-Provides:          bundled(hiredis)
-Provides:          bundled(jemalloc)
-Provides:          bundled(lua-libs)
-Provides:          bundled(linenoise)
+# from deps/hiredis/hiredis.h
+Provides:          bundled(hiredis) = 0.14.0
+# from deps/jemalloc/VERSION
+Provides:          bundled(jemalloc) = 5.1.0
+# 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)
 
 %global redis_modules_abi 1
@@ -122,6 +126,7 @@ Conflicts:         redis < 4.0
 Manual pages and detailed documentation for many aspects of Redis use,
 administration and development.
 
+
 %prep
 %setup -q -b 10
 %setup -q
@@ -130,6 +135,7 @@ mv ../%{name}-doc-%{doc_commit} doc
 %patch0002 -p1
 
 mv deps/lua/COPYRIGHT    COPYRIGHT-lua
+mv deps/jemalloc/COPYING COPYING-jemalloc
 mv deps/hiredis/COPYING  COPYING-hiredis
 
 # Configuration file changes
@@ -208,10 +214,6 @@ install -pDm644 %{S:9} %{buildroot}%{macrosdir}/macros.%{name}
 
 %check
 %if %{with tests}
-# ERR Active defragmentation cannot be enabled: it requires a Redis server compiled
-# with a modified Jemalloc like the one shipped by default with the Redis source distribution
-sed -e '/memefficiency/d' -i tests/test_helper.tcl
-
 # https://github.com/antirez/redis/issues/1417 (for "taskset -c 1")
 taskset -c 1 make %{make_flags} test
 make %{make_flags} test-sentinel
@@ -240,6 +242,9 @@ exit 0
 %files
 %{!?_licensedir:%global license %%doc}
 %license COPYING
+%license COPYRIGHT-lua
+%license COPYING-jemalloc
+%license COPYING-hiredis
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf
 %attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}-sentinel.conf
@@ -263,18 +268,25 @@ exit 0
 %dir %attr(0755, redis, redis) %ghost %{_localstatedir}/run/%{name}
 
 %files devel
+# main package is not required
 %license COPYING
-%license COPYRIGHT-lua
-%license COPYING-hiredis
 %{_includedir}/%{name}module.h
 %{macrosdir}/*
 
 %files doc
+# main package is not required
+%license COPYING
 %docdir %{_docdir}/%{name}
 %{_docdir}/%{name}
 
 
 %changelog
+* Tue Oct 27 2020 Remi Collet <remi@remirepo.net> - 6.0.9-1
+- Upstream 6.0.9 release.
+
+* Tue Oct 20 2020 Remi Collet <remi@remirepo.net> - 6.0.8-2
+- add missing LICENSE files in main package
+
 * Thu Sep 10 2020 Remi Collet <remi@remirepo.net> - 6.0.8-1
 - Upstream 6.0.8 release.
 

sources

@@ -1,2 +1,2 @@
-SHA512 (redis-6.0.8.tar.gz) = 49d1ef623c330716c035f6dfd5a4754af4d53b6ec5ea7366fecf9dd90290968893e9f2375e191e7075db563180044c30e58a63624d352ecb5413449c6136e21a
-SHA512 (redis-doc-25555fe.tar.gz) = 7d666e72a9eca17edff483b38cd3464971a6b85f764cead81242530fa18c40912bbcb30ce14e7d12f7eb88fa1ea81e1c2e1071a983996e0b7019ea68832c45da
+SHA512 (redis-6.0.9.tar.gz) = ebae2b09637fdbdc71dd22b72ccea24e2c21beb81c6ff5c4bae8b341886a7d847ce868f52dc917079bab8aa250ff61c83efe8acbb8a1cbc5e285c7842b0aefa3
+SHA512 (redis-doc-8d4bf9b.tar.gz) = 843f418e2eae688f0c568196b2d0f6a3b92e180ae3fa3839ff92088744a91bc6e1605a58e5d1618c955db95d2de867781cd4f8170df66ed9a9be9d83f7d1f2b8