rpms/mingw-zlib
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.2.11

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-08-13 21:51:28 +04:00
parent 726763bed9
commit 7335e336e1
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mingw-zlib.spec
View File

@ -1,13 +1,15 @@
%?mingw_package_header %?mingw_package_header
Name: mingw-zlib Name: mingw-zlib
Version: 1.2.8 Version: 1.2.11
Release: 12%{?dist} Release: 1%{?dist}
Summary: MinGW Windows zlib compression library Summary: MinGW Windows zlib compression library
License: zlib License: zlib
URL: http://www.zlib.net/ 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 # Replace the zlib build system with an autotools based one
Patch3: mingw32-zlib-1.2.7-autotools.patch Patch3: mingw32-zlib-1.2.7-autotools.patch
# The .def file contains an empty LIBRARY line which isn't valid # 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 %prep
%setup -q -n zlib-%{version} %setup -q -n zlib-%{version}
%patch0 -p1 -b .fixuncrypt
%patch3 -p1 -b .atools %patch3 -p1 -b .atools
%patch5 -p1 -b .def %patch5 -p1 -b .def
# patch cannot create an empty dir # patch cannot create an empty dir
@ -167,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
%changelog %changelog
* Tue Aug 13 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 1.2.11-1
- Update to 1.2.11
* Tue Aug 06 2019 Thomas Sailer <t.sailer@alumni.ethz.ch> - 1.2.8-12 * Tue Aug 06 2019 Thomas Sailer <t.sailer@alumni.ethz.ch> - 1.2.8-12
- update pkgconf file version to 1.2.8 - update pkgconf file version to 1.2.8

6
mingw32-zlib-1.2.7-autotools.patch
View File

@ -32,7 +32,7 @@ diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am
+ infflate.h + infflate.h
+ +
+# Use -version-number to match the file name used before autoconfiscation. +# 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 +include_HEADERS = zlib.h
+nodist_include_HEADERS = zconf.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 -*- +# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script. +# 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_SRCDIR([gzlib.c])
+AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign subdir-objects])
+LT_INIT +LT_INIT
+ +
+AC_SUBST([HAVE_UNISTD_H], [0]) +AC_SUBST([HAVE_UNISTD_H], [0])

14
zlib-1.2.5-minizip-fixuncrypt.patch Normal file
View File

@ -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 <stdlib.h>
#include <string.h>
-#ifndef NOUNCRYPT
- #define NOUNCRYPT
-#endif
-
#include "zlib.h"
#include "unzip.h"

14
zlib-1.2.7-use-correct-def-file.patch
View File

@ -1,7 +1,9 @@
--- zlib-1.2.5/win32/zlib.def.orig 2012-02-26 16:19:28.608868501 +0100 diff --git a/win32/zlib.def b/win32/zlib.def
+++ zlib-1.2.5/win32/zlib.def 2012-02-26 16:19:34.156864592 +0100 index 784b138..e858d1e 100644
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+LIBRARY zlib1.dll +LIBRARY zlib1.dll
; zlib data compression library ; zlib data compression library
EXPORTS EXPORTS
; basic functions ; basic functions