!8 Fix missing patch in source package

From: @ultra_planet
Reviewed-by: @zhengzhenyu
Signed-off-by: @zhengzhenyu
This commit is contained in:
openeuler-ci-bot 2021-09-02 11:07:09 +00:00 committed by Gitee
commit 13e0a146e9

View File

@ -6,7 +6,7 @@
%global Pname redis %global Pname redis
Name: redis5 Name: redis5
Version: 5.0.7 Version: 5.0.7
Release: 3 Release: 4
Summary: A persistent key-value database Summary: A persistent key-value database
License: BSD and MIT License: BSD and MIT
URL: https://redis.io URL: https://redis.io
@ -21,10 +21,10 @@ Source7: %{Pname}-limit-systemd
Source8: %{Pname}-limit-init Source8: %{Pname}-limit-init
Source9: macros.%{Pname} Source9: macros.%{Pname}
Source10: https://github.com/antirez/%{Pname}-doc/archive/%{doc_commit}/%{Pname}-doc-%{short_doc_commit}.tar.gz Source10: https://github.com/antirez/%{Pname}-doc/archive/%{doc_commit}/%{Pname}-doc-%{short_doc_commit}.tar.gz
%ifarch aarch64
Patch0001: Modify-aarch64-architecture-jemalloc-page-size-from-from-4k-to-64k.patch Patch0001: Modify-aarch64-architecture-jemalloc-page-size-from-from-4k-to-64k.patch
%endif
Patch0002: Fix-redis5-gcc-10.patch Patch0002: Fix-redis5-gcc-10.patch
BuildRequires: gcc BuildRequires: gcc
%if %{with tests} %if %{with tests}
BuildRequires: procps-ng tcl BuildRequires: procps-ng tcl
@ -80,7 +80,11 @@ administration and development.
%prep %prep
tar -xvf %{SOURCE10} tar -xvf %{SOURCE10}
%autosetup -n %{Pname}-%{version} -p1 %setup -n %{Pname}-%{version}
%ifarch aarch64
%patch0001 -p1
%endif
%patch0002 -p1
mv ../%{Pname}-doc-%{doc_commit} doc mv ../%{Pname}-doc-%{doc_commit} doc
mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/lua/COPYRIGHT COPYRIGHT-lua
mv deps/hiredis/COPYING COPYING-hiredis mv deps/hiredis/COPYING COPYING-hiredis
@ -185,6 +189,9 @@ exit 0
%{_docdir}/%{Pname} %{_docdir}/%{Pname}
%changelog %changelog
* Thu Sep 02 2021 lingsheng <lingsheng@huawei.com> - 5.0.7-4
- Fix missing patch in source package
* Tue Aug 03 2021 wangyong <wangyong187@huawei.com> - 5.0.7-3 * Tue Aug 03 2021 wangyong <wangyong187@huawei.com> - 5.0.7-3
- Fix build error caused by GCC upgrade to GCC-10 - Fix build error caused by GCC upgrade to GCC-10