From f4730923ba269e01cc7462705623024f4c5af3e1 Mon Sep 17 00:00:00 2001
From: sunguoshuai <sunguoshuai@huawei.com>
Date: Wed, 24 Mar 2021 17:21:33 +0800
Subject: [PATCH] change patch file in order src.rpm is same in aarch64 and
 x86_64

(cherry picked from commit 7bce81ce0a19017639b98c86f5ceeb51c61dd6c1)
---
 redis.spec | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/redis.spec b/redis.spec
index 593c12b..d8036ac 100644
--- a/redis.spec
+++ b/redis.spec
@@ -1,6 +1,6 @@
 Name:           redis
 Version:        4.0.11
-Release:        12
+Release:        13
 Summary:        A persistent key-value database
 License:        BSD and MIT
 URL:            https://redis.io
@@ -17,9 +17,7 @@ Patch0003:      CVE-2020-14147.patch
 Patch0004:      improved-HyperLogLog-cardinality-estimation.patch
 Patch0005:      Aesthetic-changes-to-PR.patch
 Patch0006:      CVE-2019-10193.patch
-%ifarch aarch64
 Patch0007:      modify-aarch64-architecture-jemalloc-page-size-from-4k-to-64k.patch
-%endif
 Patch0008:      CVE-2021-21309.patch
 BuildRequires:     systemd
 Requires:          /bin/awk
@@ -34,7 +32,17 @@ Redis is an advanced key-value store. It is often referred to as a dattructure s
 ,lists, sets anorted sets.
 
 %prep
-%autosetup -p1
+%setup
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1
+%patch0006 -p1
+%ifarch aarch64
+%patch0007 -p1
+%endif
+%patch0008 -p1
 sed -i -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' redis.conf
 sed -i -e '$ alogfile /var/log/redis/sentinel.log' sentinel.conf
 sed -i -e 's|^dir .*$|dir /var/lib/redis|g' redis.conf
@@ -91,6 +99,9 @@ exit 0
 %{_unitdir}/%{name}-sentinel.service
 
 %changelog
+* Wed 24 Mar 2021 sunguoshuai <sunguoshuai@huawei.com> - 4.0.11-13
+- change patch file in order src.rpm is same in aarch64 and x86_64
+
 * Fri Mar 12 2021 wangxiao <wangxiao65@huawei.com> - 4.0.11-12
 - Fix CVE-2021-21309
 
-- 
Gitee