diff --git a/mingw-zlib.spec b/mingw-zlib.spec index 07a2a1c..5a937e5 100644 --- a/mingw-zlib.spec +++ b/mingw-zlib.spec @@ -1,13 +1,15 @@ %?mingw_package_header Name: mingw-zlib -Version: 1.2.8 -Release: 12%{?dist} +Version: 1.2.11 +Release: 1%{?dist} Summary: MinGW Windows zlib compression library License: zlib URL: http://www.zlib.net/ -Source0: http://www.zlib.net/zlib-%{version}.tar.gz +Source0: http://www.zlib.net/zlib-%{version}.tar.xz +# https://github.com/madler/zlib/pull/210 +Patch0: zlib-1.2.5-minizip-fixuncrypt.patch # Replace the zlib build system with an autotools based one Patch3: mingw32-zlib-1.2.7-autotools.patch # The .def file contains an empty LIBRARY line which isn't valid @@ -86,6 +88,7 @@ MinGW Minizip manipulates files from a .zip archive. %prep %setup -q -n zlib-%{version} +%patch0 -p1 -b .fixuncrypt %patch3 -p1 -b .atools %patch5 -p1 -b .def # patch cannot create an empty dir @@ -167,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} %changelog +* Tue Aug 13 2019 Marc-André Lureau - 1.2.11-1 +- Update to 1.2.11 + * Tue Aug 06 2019 Thomas Sailer - 1.2.8-12 - update pkgconf file version to 1.2.8 diff --git a/mingw32-zlib-1.2.7-autotools.patch b/mingw32-zlib-1.2.7-autotools.patch index 8aebfc3..e93abb5 100644 --- a/mingw32-zlib-1.2.7-autotools.patch +++ b/mingw32-zlib-1.2.7-autotools.patch @@ -32,7 +32,7 @@ diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am + infflate.h + +# Use -version-number to match the file name used before autoconfiscation. -+libz_la_LDFLAGS = -version-number 1:2:8 -no-undefined ++libz_la_LDFLAGS = -version-number 1:2:11 -no-undefined + +include_HEADERS = zlib.h +nodist_include_HEADERS = zconf.h @@ -79,10 +79,10 @@ diff -urN zlib-1.2.3.orig/configure.ac zlib-1.2.3.kasal/configure.ac +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + -+AC_INIT([zlib], [1.2.8], [bugzilla.redhat.com]) ++AC_INIT([zlib], [1.2.11], [bugzilla.redhat.com]) +AC_CONFIG_SRCDIR([gzlib.c]) +AC_CONFIG_MACRO_DIR([m4]) -+AM_INIT_AUTOMAKE([foreign]) ++AM_INIT_AUTOMAKE([foreign subdir-objects]) +LT_INIT + +AC_SUBST([HAVE_UNISTD_H], [0]) diff --git a/zlib-1.2.5-minizip-fixuncrypt.patch b/zlib-1.2.5-minizip-fixuncrypt.patch new file mode 100644 index 0000000..d113879 --- /dev/null +++ b/zlib-1.2.5-minizip-fixuncrypt.patch @@ -0,0 +1,14 @@ +diff -up zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt zlib-1.2.5/contrib/minizip/unzip.c +--- zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt 2011-11-11 12:13:56.335867758 -0500 ++++ zlib-1.2.5/contrib/minizip/unzip.c 2011-11-11 12:14:01.747799372 -0500 +@@ -68,10 +68,6 @@ + #include + #include + +-#ifndef NOUNCRYPT +- #define NOUNCRYPT +-#endif +- + #include "zlib.h" + #include "unzip.h" + diff --git a/zlib-1.2.7-use-correct-def-file.patch b/zlib-1.2.7-use-correct-def-file.patch index 5cf1923..fd8ef7f 100644 --- a/zlib-1.2.7-use-correct-def-file.patch +++ b/zlib-1.2.7-use-correct-def-file.patch @@ -1,7 +1,9 @@ ---- 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 +diff --git a/win32/zlib.def b/win32/zlib.def +index 784b138..e858d1e 100644 +--- a/win32/zlib.def ++++ b/win32/zlib.def @@ -1,3 +1,4 @@ -+LIBRARY zlib1.dll - ; zlib data compression library - EXPORTS - ; basic functions ++LIBRARY zlib1.dll + ; zlib data compression library + EXPORTS + ; basic functions