rpms/zlib/devel zlib-1.2.5-gentoo.patch,NONE,1.1 zlib.spec,1.58,1.59

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/zlib/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30200

Modified Files:
	zlib.spec 
Added Files:
	zlib-1.2.5-gentoo.patch 
Log Message:
- Resolves: #591317
  pdfedit fails to compile on i686 with zlib.h errors


zlib-1.2.5-gentoo.patch:
 zlib.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zlib-1.2.5-gentoo.patch ---
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));


Index: zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- zlib.spec	22 Apr 2010 11:10:11 -0000	1.58
+++ zlib.spec	16 Jun 2010 11:53:03 -0000	1.59
@@ -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 minizi
 %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 at 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 at redhat.com> - 1.2.5-1
 - update to 1.2.5