From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 31 Jan 2012 19:53:01 +0000 (+0100)
Subject: zlib: Update to 1.2.6.
X-Git-Tag: pango~917
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f106099a5ffdbdc667ee41ffd7d7ee1f61be46c;p=people%2Fstevee%2Fipfire-3.x.git

zlib: Update to 1.2.6.

Closes #10015.
---

diff --git a/zlib/patches/zlib-1.2.5-gentoo.patch b/zlib/patches/zlib-1.2.5-gentoo.patch
deleted file mode 100644
index 82c7f3973..000000000
--- a/zlib/patches/zlib-1.2.5-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/zlib.nm b/zlib/zlib.nm
index 08d9f4f56..5e989317c 100644
--- a/zlib/zlib.nm
+++ b/zlib/zlib.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = zlib
-version    = 1.2.5
-release    = 3
+version    = 1.2.6
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.gzip.org/zlib/
@@ -43,7 +43,6 @@ end
 
 packages
 	package %{name}
-	end
 
 	package %{name}-devel
 		template DEVEL