Update to 1.2.7

.gitignore

@@ -1,2 +1,3 @@
 zlib-1.2.3.tar.gz
 /zlib-1.2.5.tar.gz
+/zlib-1.2.7.tar.gz

mingw-zlib.spec

@@ -1,11 +1,8 @@
 %?mingw_package_header
 
-%global mingw_build_win32 1
-%global mingw_build_win64 1
-
 Name:           mingw-zlib
-Version:        1.2.5
-Release:        11%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        zlib
@@ -13,11 +10,9 @@ Group:          Development/Libraries
 URL:            http://www.zlib.net/
 Source0:        http://www.zlib.net/zlib-%{version}.tar.gz
 # Replace the zlib build system with an autotools based one
-Patch3:         mingw32-zlib-1.2.5-autotools.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=591317
-Patch4:         zlib-1.2.5-gentoo.patch
+Patch3:         mingw32-zlib-1.2.7-autotools.patch
 # The .def file contains an empty LIBRARY line which isn't valid
-Patch5:         zlib-1.2.5-use-correct-def-file.patch
+Patch5:         zlib-1.2.7-use-correct-def-file.patch
 # Libtool tries to make a libz-1.dll while we expect zlib1.dll
 # Force this by hacking the ltmain.sh
 Patch6:         mingw32-zlib-create-zlib1-dll.patch
@@ -95,7 +90,6 @@ MinGW Minizip manipulates files from a .zip archive.
 %prep
 %setup -q -n zlib-%{version}
 %patch3 -p1 -b .atools
-%patch4 -p1 -b .g
 %patch5 -p1 -b .def
 # patch cannot create an empty dir
 mkdir m4
@@ -176,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
 
 
 %changelog
+* Thu Nov 22 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.2.7-1
+- Update to 1.2.7
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.5-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

mingw32-zlib-1.2.7-autotools.patch

@@ -80,7 +80,7 @@ diff -urN zlib-1.2.3.orig/configure.ac zlib-1.2.3.kasal/configure.ac
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_INIT([zlib], [1.2.5], [bugzilla.redhat.com])
-+AC_CONFIG_SRCDIR([minigzip.c])
++AC_CONFIG_SRCDIR([gzlib.c])
 +AC_CONFIG_MACRO_DIR([m4])
 +AM_INIT_AUTOMAKE([foreign])
 +LT_INIT

sources

@@ -1 +1 @@
-c735eab2d659a96e5a594c9e8541ad63  zlib-1.2.5.tar.gz
+60df6a37c56e7c1366cca812414f7b85  zlib-1.2.7.tar.gz

zlib-1.2.5-gentoo.patch

@@ -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));

zlib-1.2.7-use-correct-def-file.patch

@@ -1,8 +1,7 @@
 --- zlib-1.2.5/win32/zlib.def.orig      2012-02-26 16:19:28.608868501 +0100
 +++ zlib-1.2.5/win32/zlib.def   2012-02-26 16:19:34.156864592 +0100
-@@ -1,4 +1,4 @@
--LIBRARY
+@@ -1,3 +1,4 @@
 +LIBRARY zlib1.dll
  ; zlib data compression library
-
  EXPORTS
+ ; basic functions