diff --git a/0003-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch b/0003-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch deleted file mode 100644 index 8ca1161..0000000 --- a/0003-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From df079a0b34f922b75ad388b16f8f7eace52a09b0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 12 Feb 2020 16:16:41 +1100 -Subject: [PATCH 3/3] Mark extern definition of SDS_NOINIT in sds.h - -This helps avoiding multiple definition of this variable, its also -defined globally in sds.c - -Signed-off-by: Khem Raj ---- - src/sds.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sds.h b/src/sds.h -index 1bdb60d..adcc12c 100644 ---- a/src/sds.h -+++ b/src/sds.h -@@ -34,7 +34,7 @@ - #define __SDS_H - - #define SDS_MAX_PREALLOC (1024*1024) --const char *SDS_NOINIT; -+extern const char *SDS_NOINIT; - - #include - #include --- -2.24.1 - diff --git a/redis.spec b/redis.spec index 13cb475..d24d111 100644 --- a/redis.spec +++ b/redis.spec @@ -48,8 +48,6 @@ Source10: https://github.com/antirez/%{name}-doc/archive/%{doc_commit}/ Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch # https://github.com/antirez/redis/pull/3494 - symlink Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch -# https://github.com/antirez/redis/pull/6691 - gcc v10 -Patch0003: 0003-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch BuildRequires: gcc %if 0%{?with_tests} BuildRequires: procps-ng @@ -127,7 +125,6 @@ administration and development. mv ../%{name}-doc-%{doc_commit} doc %patch0001 -p1 %patch0002 -p1 -%patch0003 -p1 mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/hiredis/COPYING COPYING-hiredis