packages: zlib/zlib.spec, zlib/define-off64_t (NEW) - rel 4; off64_t fix fr...

[arekm]

Author: arekm                        Date: Fri Oct  9 17:37:35 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; off64_t fix from debian

---- Files affected:
packages/zlib:
   zlib.spec (1.113 -> 1.114) , define-off64_t (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/zlib/zlib.spec
diff -u packages/zlib/zlib.spec:1.113 packages/zlib/zlib.spec:1.114
--- packages/zlib/zlib.spec:1.113	Fri Oct  9 19:33:27 2009
+++ packages/zlib/zlib.spec	Fri Oct  9 19:37:29 2009
@@ -32,9 +32,10 @@
 Summary(uk.UTF-8):	Бібліотека для компресії та декомпресії
 Name:		zlib
 Version:	1.2.3.3
-Release:	3
+Release:	4
 Patch0:		minizip-autotools.patch
 Patch1:		minizip-1.2.3-malloc.patch
+Patch2:		define-off64_t
 License:	BSD
 Group:		Libraries
 Source0:	http://www.zlib.net/current/beta/%{name}-%{version}.tar.gz
@@ -279,6 +280,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %if %{with asmopt}
 %ifarch i686 pentium3 pentium4 athlon
@@ -377,6 +379,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2009/10/09 17:37:29  arekm
+- rel 4; off64_t fix from debian
+
 Revision 1.113  2009/10/09 17:33:27  arekm
 - rel 3; minizip malloc check
 

================================================================
Index: packages/zlib/define-off64_t
diff -u /dev/null packages/zlib/define-off64_t:1.1
--- /dev/null	Fri Oct  9 19:37:35 2009
+++ packages/zlib/define-off64_t	Fri Oct  9 19:37:29 2009
@@ -0,0 +1,17 @@
+We need to ensure that off64_t is defined when building with
+_LARGEFILE64_SOURCE.
+
+--- zlib-1.2.3.3.old/zconf.h	2006-12-31 17:23:02 +0000
++++ zlib-1.2.3.3/zconf.h	2007-06-12 15:20:36 +0000
+@@ -353,6 +353,10 @@
+ 
+ #include "zlibdefs.h"       /* created by configure */
+ 
++#ifdef _LARGEFILE64_SOURCE
++#include <sys/types.h>
++#endif
++
+ #ifndef SEEK_SET
+ #  define SEEK_SET        0       /* Seek from beginning of file.  */
+ #  define SEEK_CUR        1       /* Seek from current position.  */
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zlib/zlib.spec?r1=1.113&r2=1.114&f=u