Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/zlib.git#fab772edf648dc5ca44b906920825d8d5e299af5
This commit is contained in:
DistroBaker 2021-02-03 23:03:56 +00:00
parent 45d8f316cf
commit 32440a9404
1 changed files with 8 additions and 4 deletions

View File

@ -2,13 +2,13 @@
Name: zlib Name: zlib
Version: 1.2.11 Version: 1.2.11
Release: 23%{?dist} Release: 24%{?dist}
Summary: The compression and decompression library Summary: Compression and decompression library
# /contrib/dotzlib/ have Boost license # /contrib/dotzlib/ have Boost license
License: zlib and Boost License: zlib and Boost
URL: http://www.zlib.net/ URL: https://www.zlib.net/
Source: http://www.zlib.net/zlib-%{version}.tar.xz Source: https://www.zlib.net/zlib-%{version}.tar.xz
# https://github.com/madler/zlib/pull/210 # https://github.com/madler/zlib/pull/210
Patch0: zlib-1.2.5-minizip-fixuncrypt.patch Patch0: zlib-1.2.5-minizip-fixuncrypt.patch
# resolves: #805113 # resolves: #805113
@ -35,6 +35,7 @@ Patch13: zlib-1.2.11-IBM-DFLTCC-compression-level-switching-issues.patch
# fixed inflateSyncPoint() bad return value on z15 # fixed inflateSyncPoint() bad return value on z15
Patch14: zlib-1.2.11-inflateSyncPoint-return-value-fix.patch Patch14: zlib-1.2.11-inflateSyncPoint-return-value-fix.patch
BuildRequires: make
BuildRequires: automake, autoconf, libtool BuildRequires: automake, autoconf, libtool
%global __provides_exclude_from ^%{_libdir}/pkgconfig/minizip\\.pc$ %global __provides_exclude_from ^%{_libdir}/pkgconfig/minizip\\.pc$
@ -191,6 +192,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%changelog %changelog
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Nov 18 2020 Ondrej Dubaj <odubaj@redhat.com> - 1.2.11-23 * Wed Nov 18 2020 Ondrej Dubaj <odubaj@redhat.com> - 1.2.11-23
- backport IBM Z updates to fedora - backport IBM Z updates to fedora