From edcf529235631e783008fe9f578b1c084193169a Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 11 Mar 2021 20:30:53 +0000 Subject: [PATCH] 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#1b9dab8fcdec8597e1b2edf24f491f4bb3d14dac --- .gitignore | 2 ++ redis.spec | 23 +++++++++++++---------- sources | 4 ++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index cd38325..5481da9 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,5 @@ clog /redis-6.0.9.tar.gz /redis-doc-8d4bf9b.tar.gz /redis-6.0.10.tar.gz +/redis-6.0.11.tar.gz +/redis-doc-e052823.tar.gz diff --git a/redis.spec b/redis.spec index 0fed146..7c8b597 100644 --- a/redis.spec +++ b/redis.spec @@ -12,15 +12,15 @@ # Commit IDs for the (unversioned) redis-doc repository # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision" -%global doc_commit 8d4bf9bc476829a84a055c049be72634d6e938df +%global doc_commit e0528232fdd0d2efc91d62b798b924d716f88813 %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.10 -Release: 2%{?dist} +Version: 6.0.11 +Release: 1%{?dist} Summary: A persistent key-value database # redis, jemalloc, linenoise, lzf, hiredis are BSD # lua is MIT @@ -33,7 +33,7 @@ Source3: %{name}.service Source6: %{name}-shutdown Source7: %{name}-limit-systemd Source9: macros.%{name} -Source10: https://github.com/antirez/%{name}-doc/archive/%{doc_commit}/%{name}-doc-%{short_doc_commit}.tar.gz +Source10: https://github.com/%{name}/%{name}-doc/archive/%{doc_commit}/%{name}-doc-%{short_doc_commit}.tar.gz # To refresh patches: # tar xf redis-xxx.tar.gz && cd redis-xxx && git init && git add . && git commit -m "%%{version} baseline" @@ -41,9 +41,9 @@ Source10: https://github.com/antirez/%{name}-doc/archive/%{doc_commit}/ # Then refresh your patches # git format-patch HEAD~ # Update configuration for Fedora -# https://github.com/antirez/redis/pull/3491 - man pages +# https://github.com/redis/redis/pull/3491 - man pages Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch -# https://github.com/antirez/redis/pull/3494 - symlink +# https://github.com/redis/redis/pull/3494 - symlink Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch BuildRequires: make @@ -212,7 +212,7 @@ install -pDm644 %{S:9} %{buildroot}%{macrosdir}/macros.%{name} %check %if %{with tests} -# https://github.com/antirez/redis/issues/1417 (for "taskset -c 1") +# https://github.com/redis/redis/issues/1417 (for "taskset -c 1") taskset -c 1 make %{make_flags} test make %{make_flags} test-sentinel %endif @@ -299,6 +299,9 @@ fi %changelog +* Wed Feb 24 2021 Nathan Scott - 6.0.11-1 +- Upstream 6.0.11 release. + * Wed Jan 27 2021 Fedora Release Engineering - 6.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -339,7 +342,7 @@ fi * Thu May 28 2020 Remi Collet - 6.0.4-3 - Add comment for TimeoutStartSec and TimeoutStopSec in limit.conf - Fix missing notification to systemd for sentinel - patch from https://github.com/antirez/redis/pull/7168 + patch from https://github.com/redis/redis/pull/7168 - Upstream 6.0.4 release. * Mon May 18 2020 Nathan Scott - 6.0.3-1 @@ -503,11 +506,11 @@ fi * Wed Sep 14 2016 Remi Collet - 3.2.3-2 - add missing man pages #1374577 - using patch from https://github.com/antirez/redis/pull/3491 + using patch from https://github.com/redis/redis/pull/3491 - data and configuration should not be publicly readable #1374700 - remove /var/run/redis with systemd #1374728 - provide redis-check-rdb as a symlink to redis-server #1374736 - using patch from https://github.com/antirez/redis/pull/3494 + using patch from https://github.com/redis/redis/pull/3494 - move redis-shutdown to libexec * Thu Aug 4 2016 Haïkel Guémar - 3.2.3-1 diff --git a/sources b/sources index db69feb..836dfbe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (redis-6.0.10.tar.gz) = 4ef60645316143db3c26c45e90c7dc629e15641313267fd732396212c67db9ebeb9e170d830599b2e143ad5135d1ef249b6fbc1fb4960f4cf857cfdb5c1470c8 -SHA512 (redis-doc-8d4bf9b.tar.gz) = 843f418e2eae688f0c568196b2d0f6a3b92e180ae3fa3839ff92088744a91bc6e1605a58e5d1618c955db95d2de867781cd4f8170df66ed9a9be9d83f7d1f2b8 +SHA512 (redis-6.0.11.tar.gz) = 13b08a98c2d89c2c53c9a80fe27acc98dbc9fd8e93d7baabed381c401877bd8672cf4472b17d8843edda674c41849859b90a722a3c99d99cfdc3769ae5e0a979 +SHA512 (redis-doc-e052823.tar.gz) = 391e7f5566dfd734d34dec3ffb388392a1139f9180f3f5ba49e9cf63aa90b9cc4995973a76fa6a6561a32566ee32d3a07e8359aefb50d7cbbf91fa0d8be60c64