[ZipArchive] Fix ZipArchive not building with the latest zlib

[Hans de Goede]

commit 9a4063306a69c01a37256b1af5e8e852ed110380
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sun Jul 29 11:40:07 2012 +0200

    Fix ZipArchive not building with the latest zlib

 ZipArchive-4.1.1-new-zlib.patch |   21 +++++++++++++++++++++
 ZipArchive.spec                 |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/ZipArchive-4.1.1-new-zlib.patch b/ZipArchive-4.1.1-new-zlib.patch
new file mode 100644
index 0000000..7da326c
--- /dev/null
+++ b/ZipArchive-4.1.1-new-zlib.patch
@@ -0,0 +1,21 @@
+diff -up ZipArchive-4.1.1/ZipArchive/ZipCrc32Cryptograph.h~ ZipArchive-4.1.1/ZipArchive/ZipCrc32Cryptograph.h
+--- ZipArchive-4.1.1/ZipArchive/ZipCrc32Cryptograph.h~	2012-07-29 11:29:32.000000000 +0200
++++ ZipArchive-4.1.1/ZipArchive/ZipCrc32Cryptograph.h	2012-07-29 11:36:05.209224077 +0200
+@@ -82,7 +82,7 @@ public:
+ 	/**
+ 		Returns the CRC table.
+ 	*/
+-	static const unsigned long* GetCRCTable()
++	static const unsigned int* GetCRCTable()
+ 	{
+ 			return zarch_get_crc_table();
+ 	}
+@@ -103,7 +103,7 @@ private:
+ 	void CryptUpdateKeys(char c);
+ 	DWORD CryptCRC32(DWORD l, char c)
+ 	{
+-		const unsigned long* CRC_TABLE = zarch_get_crc_table();
++		const unsigned int* CRC_TABLE = zarch_get_crc_table();
+ 		return CRC_TABLE[(l ^ c) & 0xff] ^ (l >> 8);
+ 	}
+ 	void CryptEncode(char &c)
diff --git a/ZipArchive.spec b/ZipArchive.spec
index 4b1393b..1739234 100644
--- a/ZipArchive.spec
+++ b/ZipArchive.spec
@@ -1,6 +1,6 @@
 Name:           ZipArchive
 Version:        4.1.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Library for accessing zip files
 
 Group:          System Environment/Libraries
@@ -17,6 +17,8 @@ Patch2:         %{name}-system-zlib.patch
 Patch3:         %{name}-gcc-4.7.patch 
 # Fix ZipArchive not recognising dirs as such in some zips
 Patch4:         %{name}-4.1.1-file-attr-fix.patch
+# Fix ZipArchive not building with latest version of zlib
+Patch5:         %{name}-4.1.1-new-zlib.patch
 
 BuildRequires:  libtool
 BuildRequires:  zlib-devel
@@ -48,6 +50,7 @@ developing applications that use %{name}.
 %patch2 -p1 -b .system-zlib
 %patch3 -p1 -b .gcc47
 %patch4 -p1
+%patch5 -p1
 
 for i in ZipArchive/*.txt; do
     sed -i.old 's/\r//' "$i"
@@ -91,6 +94,9 @@ install -p -m 644 %{name}.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 
 
 %changelog
+* Sun Jul 29 2012 Hans de Goede <hdegoede at redhat.com> - 4.1.1-10
+- Fix ZipArchive not building with the latest zlib
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild