From 4169bb254420c87667f6f4bcc03a5e5356123c86 Mon Sep 17 00:00:00 2001 From: Jun Yang Date: Mon, 1 Nov 2021 17:55:37 +0800 Subject: [PATCH] zlib: list all the patches for aarch64 to make the source rpm same both for x86_64 and aarch64 Signed-off-by: Jun Yang --- zlib.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/zlib.spec b/zlib.spec index e6ecf27..2d70349 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,6 +1,6 @@ Name: zlib Version: 1.2.11 -Release: 18 +Release: 19 Summary: A lossless data-compression library License: zlib and Boost URL: http://www.zlib.net @@ -8,14 +8,14 @@ Source0: http://www.zlib.net/zlib-%{version}.tar.xz # Patch0 get from fedora Patch0: zlib-1.2.5-minizip-fixuncrypt.patch -%ifarch aarch64 + +# Patches for aarch64 only # Patch1 to Patch3 get from http://www.gildor.org/en/projects/zlib Patch1: 0001-Neon-Optimized-hash-chain-rebase.patch Patch2: 0002-Porting-optimized-longest_match.patch Patch3: 0003-arm64-specific-build-patch.patch Patch4: 0004-zlib-Optimize-CRC32.patch Patch5: zlib-1.2.11-SIMD.patch -%endif Patch6000: fix-undefined-buffer-detected-by-oss-fuzz.patch @@ -60,7 +60,16 @@ Requires: %{name}-devel = %{version}-%{release} This package contains the development-related content related to minizip. %prep -%autosetup -p1 +%setup +%patch0 -p1 +%ifarch aarch64 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%endif +%patch6000 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -118,6 +127,9 @@ make test %{_libdir}/pkgconfig/minizip.pc %changelog +* Mon Nov 1 2021 Jun Yang - 1.2.11-19 +- list all the patches for aarch64 to make the source rpm same both for x86_64 and aarch64. + * Mon Sep 14 2020 noah - 1.2.11-18 - add zlib-1.2.11-SIMD.patch