From dd27fb23b9c004360da6f96e5e49a33fce1a771e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 10 Aug 2013 14:58:20 +0200 Subject: [PATCH] Fix missing minizip include https://bugzilla.redhat.com/show_bug.cgi?id=985344 --- zlib-1.2.8-minizip-include.patch | 27 +++++++++++++++++++++++++++ zlib.spec | 10 +++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create 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 new file mode 100644 index 0000000..e8afe95 --- /dev/null +++ b/zlib-1.2.8-minizip-include.patch @@ -0,0 +1,27 @@ +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 438346c..59a38ae 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,7 +1,7 @@ Summary: The compression and decompression library Name: zlib Version: 1.2.8 -Release: 2%{?dist} +Release: 3%{?dist} # /contrib/dotzlib/ have Boost license License: zlib and Boost Group: System Environment/Libraries @@ -13,6 +13,9 @@ Patch0: zlib-1.2.5-minizip-fixuncrypt.patch 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 @@ -66,6 +69,7 @@ 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 @@ -126,6 +130,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/minizip.pc %changelog +* Sat Aug 10 2013 Kalev Lember - 1.2.8-3 +- resolves: #985344 + add a patch to fix missing minizip include + * Sun Aug 04 2013 Fedora Release Engineering - 1.2.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild