From 737073327af596bcafa3da7c939fadfb49c592de Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 24 Jan 2017 07:15:40 +0100 Subject: [PATCH] minizip: don't include zconf.h in crypt.h Related: rhbz#985344 Version: 1.2.11-1 --- zlib-1.2.8-minizip-include.patch | 27 --------------------------- zlib.spec | 6 ++---- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 zlib-1.2.8-minizip-include.patch diff --git a/zlib-1.2.8-minizip-include.patch b/zlib-1.2.8-minizip-include.patch deleted file mode 100644 index e8afe95..0000000 --- a/zlib-1.2.8-minizip-include.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 790c73ad93732d31ec6ae5ba4d7116d7f8fb46a2 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Sat, 10 Aug 2013 14:54:04 +0200 -Subject: [PATCH] minizip: Add missing include - -Include zconf.h for z_crc_t, fixes a regression from commit -63ba7582b80eb81b126c2931e485481c35596aab. ---- - contrib/minizip/crypt.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/contrib/minizip/crypt.h b/contrib/minizip/crypt.h -index 1e9e820..835a2ba 100644 ---- a/contrib/minizip/crypt.h -+++ b/contrib/minizip/crypt.h -@@ -27,6 +27,8 @@ - Encryption is not supported. - */ - -+#include "zconf.h" -+ - #define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8)) - - /*********************************************************************** --- -1.8.3.1 - diff --git a/zlib.spec b/zlib.spec index 83f1829..70f50ff 100644 --- a/zlib.spec +++ b/zlib.spec @@ -8,14 +8,12 @@ Group: System Environment/Libraries URL: http://www.zlib.net/ Source: http://www.zlib.net/zlib-%{version}.tar.xz +# https://github.com/madler/zlib/pull/210 Patch0: zlib-1.2.5-minizip-fixuncrypt.patch # resolves: #805113 Patch1: zlib-1.2.7-optimized-s390.patch # resolves: #844791 Patch2: zlib-1.2.7-z-block-flush.patch -# resolves: #985344 -# http://mail.madler.net/pipermail/zlib-devel_madler.net/2013-August/003081.html -Patch3: zlib-1.2.8-minizip-include.patch BuildRequires: automake, autoconf, libtool @@ -69,7 +67,6 @@ developing applications which use minizip. %patch1 -p1 -b .optimized-deflate %endif %patch2 -p1 -b .z-flush -%patch3 -p1 -b .minizip_include iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog.tmp mv ChangeLog.tmp ChangeLog @@ -146,6 +143,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la * Tue Jan 24 2017 Pavel Raiskup - 1.2.11-1 - latest upstream release (rhbz#1409372) - cleanup rpmlint +- revert fix for rhbz#985344 * Fri Feb 05 2016 Fedora Release Engineering - 1.2.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild