From b960968fdb2b11a25d678e885ba64c0bef382ef7 Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Jun 16 2010 11:53:03 +0000
Subject: - Resolves: #591317 pdfedit fails to compile on i686 with zlib.h errors


---

diff --git a/zlib-1.2.5-gentoo.patch b/zlib-1.2.5-gentoo.patch
new file mode 100644
index 0000000..82c7f39
--- /dev/null
+++ b/zlib-1.2.5-gentoo.patch
@@ -0,0 +1,12 @@
+diff -up zlib-1.2.5/zlib.h.pom zlib-1.2.5/zlib.h
+--- zlib-1.2.5/zlib.h.pom	2010-04-20 06:12:48.000000000 +0200
++++ zlib-1.2.5/zlib.h	2010-06-16 13:08:59.000000000 +0200
+@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
+ #  define gzoffset gzoffset64
+ #  define adler32_combine adler32_combine64
+ #  define crc32_combine crc32_combine64
+-#  ifdef _LARGEFILE64_SOURCE
++#  ifndef _LARGEFILE64_SOURCE
+      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
diff --git a/zlib.spec b/zlib.spec
index 8577373..1122933 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,10 +1,12 @@
 Summary: The zlib compression and decompression library
 Name: zlib
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Source: http://www.zlib.net/zlib-%{version}.tar.bz2
 Patch3: zlib-1.2.4-autotools.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=591317
+Patch4: zlib-1.2.5-gentoo.patch
 URL: http://www.gzip.org/zlib/
 # /contrib/dotzlib/ have Boost license
 License: zlib and Boost
@@ -57,6 +59,7 @@ developing applications which use minizip.
 %prep
 %setup -q
 %patch3 -p1 -b .atools
+%patch4 -p1 -b .g
 # patch cannot create an empty dir
 mkdir contrib/minizip/m4
 cp minigzip.c contrib/minizip
@@ -136,6 +139,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/pkgconfig/minizip.pc
 
 %changelog
+* Wed Jun 16 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 1.2.5-2
+- Resolves: #591317
+  pdfedit fails to compile on i686 with zlib.h errors
+
 * Thu Apr 22 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 1.2.5-1
 - update to 1.2.5