diff --git a/.gitignore b/.gitignore index 5481da9..1990e01 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,5 @@ clog /redis-6.0.10.tar.gz /redis-6.0.11.tar.gz /redis-doc-e052823.tar.gz +/redis-6.2.0.tar.gz +/redis-6.2.1.tar.gz diff --git a/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch b/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch deleted file mode 100644 index d43be3b..0000000 --- a/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 79ed52edf84676786e5817cddb8914c5925144c7 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 9 Sep 2016 17:23:27 +0200 -Subject: [PATCH 2/3] install redis-check-rdb as a symlink instead of - duplicating the binary - ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 2a68649..585c95b 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -307,9 +307,9 @@ install: all - $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN) - $(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN) - $(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN) -- $(REDIS_INSTALL) $(REDIS_CHECK_RDB_NAME) $(INSTALL_BIN) -- $(REDIS_INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN) - @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME) -+ @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME) -+ @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME) - - uninstall: - rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)} --- -2.24.1 - diff --git a/redis.spec b/redis.spec index 7c8b597..08d7fcf 100644 --- a/redis.spec +++ b/redis.spec @@ -19,7 +19,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: redis -Version: 6.0.11 +Version: 6.2.1 Release: 1%{?dist} Summary: A persistent key-value database # redis, jemalloc, linenoise, lzf, hiredis are BSD @@ -43,8 +43,6 @@ Source10: https://github.com/%{name}/%{name}-doc/archive/%{doc_commit}/ # Update configuration for Fedora # 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/redis/redis/pull/3494 - symlink -Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch BuildRequires: make BuildRequires: gcc @@ -130,7 +128,6 @@ administration and development. %setup -q mv ../%{name}-doc-%{doc_commit} doc %patch0001 -p1 -%patch0002 -p1 mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/jemalloc/COPYING COPYING-jemalloc @@ -152,7 +149,7 @@ fi %global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes %build -make %{?_smp_mflags} %{make_flags} all +%make_build %{make_flags} all %install make %{make_flags} install @@ -299,6 +296,18 @@ fi %changelog +* Thu Apr 01 2021 Nathan Scott - 6.2.1-1 +- Upstream 6.2.1 release +- Merged make-macros spec change from Tom Stellard + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 6.2.0-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Mon Mar 01 2021 Nathan Scott - 6.2.0-1 +- Upstream 6.2.0 release (RHBZ #1915463). +- drop patch merged upstream. + * Wed Feb 24 2021 Nathan Scott - 6.0.11-1 - Upstream 6.0.11 release. diff --git a/sources b/sources index 836dfbe..9d1a5f6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (redis-6.0.11.tar.gz) = 13b08a98c2d89c2c53c9a80fe27acc98dbc9fd8e93d7baabed381c401877bd8672cf4472b17d8843edda674c41849859b90a722a3c99d99cfdc3769ae5e0a979 +SHA512 (redis-6.2.1.tar.gz) = 7c339cc360fc3125bb67c5748bb4fe940977faa937e3a86294829bde472479a811df8ea0ce4961d8128ec8d4ffba5d5a943c2957589c8da0cfc3f109f82e4af6 SHA512 (redis-doc-e052823.tar.gz) = 391e7f5566dfd734d34dec3ffb388392a1139f9180f3f5ba49e9cf63aa90b9cc4995973a76fa6a6561a32566ee32d3a07e8359aefb50d7cbbf91fa0d8be60c64