rpms/zlib
7
0
Fork 0
Code Issues Pull Requests Releases Activity

[6/6] Cleanup old patches and use the new ones

Browse Source
This commit is contained in:
Lukas Javorsky 2022-06-22 17:39:57 +00:00
parent 37728e12c3
commit 872735211a
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
zlib.spec
View File

@ -13,30 +13,24 @@ Source: https://www.zlib.net/zlib-%{version}.tar.xz
Patch0: zlib-1.2.5-minizip-fixuncrypt.patch Patch0: zlib-1.2.5-minizip-fixuncrypt.patch
# resolves: #805113 # resolves: #805113
Patch1: zlib-1.2.11-optimized-s390.patch Patch1: zlib-1.2.11-optimized-s390.patch
# IBM Z optimalizations # IBM Z hardware-accelerated deflate
Patch7: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-s390x.patch # ref: https://github.com/madler/zlib/pull/410
# IBM CRC32 optimalization for POWER archs Patch18: zlib-1.2.12-IBM-Z-hw-accelerated-deflate.patch
Patch8: zlib-1.2.11-optimized-CRC32-framework.patch # IBM optimized crc32 for Power 8+ processors
# fixed firefox crash + added test case # ref: https://github.com/madler/zlib/pull/478
Patch9: zlib-1.2.11-firefox-crash-fix.patch Patch19: zlib-1.2.12-power-optimizations.patch
# Patch for s390x crc32vx
# ref: https://github.com/iii-i/zlib/releases/tag/crc32vx-v3
Patch20: zlib-1.2.12-s390x-vectorize-crc32.patch
# Fix for configure
# ref: https://github.com/madler/zlib/pull/607/commits/80d086357a55b94a13e43756cf3e131f25eef0e4
Patch21: zlib-1.2.12-fix-configure.patch
# fixed covscan issues # fixed covscan issues
Patch10: zlib-1.2.11-covscan-issues.patch Patch22: zlib-1.2.11-covscan-issues.patch
# fix for IBM Z optimalizations
Patch11: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix.patch
# permit a deflateParams() parameter change
Patch12: zlib-1.2.11-permit-deflateParams-change.patch
# fixed DFLTCC compression level switching issues
# enabled HW compression for compression levels 1 through 6
Patch13: zlib-1.2.11-IBM-DFLTCC-compression-level-switching-issues.patch
# fixed inflateSyncPoint() bad return value on z15
Patch14: zlib-1.2.11-inflateSyncPoint-return-value-fix.patch
# fixed issues found by covscan for rhel-9 # fixed issues found by covscan for rhel-9
# ref: https://github.com/madler/zlib/pull/554 # ref: https://github.com/madler/zlib/pull/554
Patch15: zlib-1.2.11-covscan-issues-rhel9.patch Patch23: zlib-1.2.11-covscan-issues-rhel9.patch
# Fix for s390x vectorize CRC32
Patch16: zlib-1.2.11-s390x-vectorize-crc32.patch
# Fix the compressBound() on z15
Patch17: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-compressBound-fix.patch
BuildRequires: make BuildRequires: make
BuildRequires: automake, autoconf, libtool BuildRequires: automake, autoconf, libtool
@ -92,20 +86,17 @@ developing applications which use minizip.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .fixuncrypt %patch0 -p1 -b .fixuncrypt
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
# Patch19 conflicts with Patch1, so the Patch1 has to be applied after,
# because it is arch specific
%ifarch s390 s390x %ifarch s390 s390x
%patch1 -p1 -b .optimized-deflate %patch1 -p1 -b .optimized-deflate
%endif %endif
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog.tmp iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog.tmp