From 979a58fbc01dba2f4d03deb05322b9532d254e0f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: May 16 2023 07:02:25 +0000 Subject: Upstream 7.2-rc2 release candidate. --- diff --git a/.gitignore b/.gitignore index fff28b6..19f7043 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ clog /redis-doc-1a2f1b6.tar.gz /redis-7.2-rc1.tar.gz /redis-doc-80258ec.tar.gz +/redis-7.2-rc2.tar.gz +/redis-doc-d1cde34.tar.gz diff --git a/redis.spec b/redis.spec index 7327a6d..6ca507a 100644 --- a/redis.spec +++ b/redis.spec @@ -15,18 +15,18 @@ # Commit IDs for the (unversioned) redis-doc repository # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision" -%global doc_commit 80258ecc251e8f7209d480cad77128ba5a43f968 +%global doc_commit d1cde3472ea50fb22a0b7b9eb74691b4aefb8dcf %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) %global upstream_ver 7.2 -%global upstream_pre rc1 +%global upstream_pre rc2 Name: redis Version: %{upstream_ver}%{?upstream_pre:~%{upstream_pre}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: A persistent key-value database # redis, hiredis: BSD-3-Clause # hdrhistogram, jemalloc, lzf, linenoise: BSD-2-Clause @@ -71,7 +71,7 @@ Requires(postun): systemd # from deps/hiredis/hiredis.h Provides: bundled(hiredis) = 1.0.3 # from deps/jemalloc/VERSION -Provides: bundled(jemalloc) = 5.2.1 +Provides: bundled(jemalloc) = 5.3.0 # from deps/lua/src/lua.h Provides: bundled(lua-libs) = 5.1.5 # from deps/linenoise/linenoise.h @@ -136,7 +136,7 @@ administration and development. %prep %setup -q -n %{name}-%{upstream_ver}%{?upstream_pre:-%{upstream_pre}} -b 10 mv ../%{name}-doc-%{doc_commit} doc -%patch0001 -p1 +%patch -P0001 -p1 mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/jemalloc/COPYING COPYING-jemalloc @@ -307,6 +307,9 @@ fi %changelog +* Tue May 16 2023 Remi Collet - 7.2~rc2-1 +- Upstream 7.2-rc2 release candidate. + * Thu Mar 30 2023 Remi Collet - 7.2~rc1-3 - fix modules directory ownership and permissions #2176173 diff --git a/sources b/sources index 1064fde..09ef4ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (redis-7.2-rc1.tar.gz) = 613ce7243c276cf8e480aa19e3d192594526fb116c8db822b3d4f77558e36cb62d032ff8b0ae652ab5da6c56bfc86612d62c88d049f1a2c2d5da2558cb0a2d62 -SHA512 (redis-doc-80258ec.tar.gz) = 3969e9ac1beb07f17eb94c4e0499494b851d62aad3c24a48a4fbad6bd65ccc9738081e7da15fee0986d59ac4361ef1135e374ee87620bb8af00b9b8122414859 +SHA512 (redis-7.2-rc2.tar.gz) = b44a9b3540a3e3c92c19fd89248688c39d1ee27b686947fac6248817f12ef8c190313ad1ae350851e30108796da18992ab68eaa0a28d8f4e47437e8999a169e6 +SHA512 (redis-doc-d1cde34.tar.gz) = 88def01897427c98eff92a2eebdddb204a96eaf6bc5cab7561aa6e5c98abbf27f33f22acda982106e005308cf67994a19d897279fc0120da5c0096fe143e854e