diff --git a/.gitignore b/.gitignore index b11df10..fee92f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ zlib-1.2.3.tar.gz /zlib-1.2.5.tar.gz +/zlib-1.2.7.tar.gz diff --git a/mingw-zlib.spec b/mingw-zlib.spec index 3d6c775..1e17293 100644 --- a/mingw-zlib.spec +++ b/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 - 1.2.7-1 +- Update to 1.2.7 + * Fri Jul 20 2012 Fedora Release Engineering - 1.2.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/mingw32-zlib-1.2.5-autotools.patch b/mingw32-zlib-1.2.5-autotools.patch deleted file mode 100644 index a3c429e..0000000 --- a/mingw32-zlib-1.2.5-autotools.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am ---- zlib-1.2.3.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ zlib-1.2.3.kasal/Makefile.am 2009-03-17 17:58:36.000000000 +0100 -@@ -0,0 +1,70 @@ -+ACLOCAL_AMFLAGS = -I m4 --install -+ -+lib_LTLIBRARIES = libz.la -+ -+libz_la_SOURCES = \ -+ adler32.c \ -+ compress.c \ -+ crc32.c \ -+ crc32.h \ -+ gzclose.c \ -+ gzlib.c \ -+ gzread.c \ -+ gzwrite.c \ -+ uncompr.c \ -+ deflate.c \ -+ deflate.h \ -+ trees.c \ -+ trees.h \ -+ zutil.c \ -+ zutil.h \ -+ inflate.c \ -+ inflate.h \ -+ infback.c \ -+ inftrees.c \ -+ inftrees.h \ -+ inffast.c \ -+ inffast.h \ -+ infflate.h -+ -+# Use -version-number to match the file name used before autoconfiscation. -+libz_la_LDFLAGS = -version-number 1:2:5 -no-undefined -+ -+include_HEADERS = zlib.h -+nodist_include_HEADERS = zconf.h -+ -+dist_man_MANS = zlib.3 -+ -+## libminizip: -+ -+lib_LTLIBRARIES += libminizip.la -+ -+libminizip_la_SOURCES = \ -+ contrib/minizip/ioapi.c \ -+ contrib/minizip/mztools.c \ -+ contrib/minizip/unzip.c \ -+ contrib/minizip/zip.c -+ -+# do not build the static version of libminizip -+libminizip_la_CFLAGS = -shared -+libminizip_la_LDFLAGS = -version-info 1:0:0 -no-undefined -+libminizip_la_LIBADD = libz.la -+ -+minizip_includedir = $(includedir)/minizip -+minizip_include_HEADERS = \ -+ contrib/minizip/crypt.h \ -+ contrib/minizip/ioapi.h \ -+ contrib/minizip/mztools.h \ -+ contrib/minizip/unzip.h \ -+ contrib/minizip/zip.h -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = minizip.pc -+ -+EXTRA_PROGRAMS = miniunzip minizip -+ -+miniunzip_SOURCES = contrib/minizip/miniunz.c -+miniunzip_LDADD = libminizip.la -+ -+minizip_SOURCES = contrib/minizip/minizip.c -+minizip_LDADD = libminizip.la -diff -urN zlib-1.2.3.orig/configure.ac zlib-1.2.3.kasal/configure.ac ---- zlib-1.2.3.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ zlib-1.2.3.kasal/configure.ac 2009-03-17 17:28:41.000000000 +0100 -@@ -0,0 +1,13 @@ -+# -*- Autoconf -*- -+# 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_MACRO_DIR([m4]) -+AM_INIT_AUTOMAKE([foreign]) -+LT_INIT -+ -+AC_SUBST([HAVE_UNISTD_H], [0]) -+AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) -+AC_CONFIG_FILES([Makefile minizip.pc zlib.pc zconf.h:zconf.h.in]) -+AC_OUTPUT -diff -urN zlib-1.2.3.orig/minizip.pc.in zlib-1.2.3.kasal/minizip.pc.in ---- zlib-1.2.3.orig/minizip.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ zlib-1.2.3.kasal/minizip.pc.in 2009-01-07 15:49:34.000000000 +0100 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@/minizip -+ -+Name: minizip -+Description: Minizip zip file manipulation library -+Requires: -+Version: @PACKAGE_VERSION@ -+Libs: -L${libdir} -lminizip -lz -+Cflags: -I${includedir} ---- zlib-1.2.3.orig/zlib.pc.in.orig 2011-08-12 13:00:47.043690473 +0200 -+++ zlib-1.2.3/zlib.pc.in 2011-08-12 13:01:00.874943334 +0200 -@@ -1,7 +1,6 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --sharedlibdir=@sharedlibdir@ - includedir=@includedir@ - - Name: zlib -@@ -9,5 +8,5 @@ - Version: @VERSION@ - - Requires: --Libs: -L${libdir} -L${sharedlibdir} -lz -+Libs: -L${libdir} -lz - Cflags: -I${includedir} diff --git a/mingw32-zlib-1.2.7-autotools.patch b/mingw32-zlib-1.2.7-autotools.patch new file mode 100644 index 0000000..76e69d7 --- /dev/null +++ b/mingw32-zlib-1.2.7-autotools.patch @@ -0,0 +1,123 @@ +diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am +--- zlib-1.2.3.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ zlib-1.2.3.kasal/Makefile.am 2009-03-17 17:58:36.000000000 +0100 +@@ -0,0 +1,70 @@ ++ACLOCAL_AMFLAGS = -I m4 --install ++ ++lib_LTLIBRARIES = libz.la ++ ++libz_la_SOURCES = \ ++ adler32.c \ ++ compress.c \ ++ crc32.c \ ++ crc32.h \ ++ gzclose.c \ ++ gzlib.c \ ++ gzread.c \ ++ gzwrite.c \ ++ uncompr.c \ ++ deflate.c \ ++ deflate.h \ ++ trees.c \ ++ trees.h \ ++ zutil.c \ ++ zutil.h \ ++ inflate.c \ ++ inflate.h \ ++ infback.c \ ++ inftrees.c \ ++ inftrees.h \ ++ inffast.c \ ++ inffast.h \ ++ infflate.h ++ ++# Use -version-number to match the file name used before autoconfiscation. ++libz_la_LDFLAGS = -version-number 1:2:5 -no-undefined ++ ++include_HEADERS = zlib.h ++nodist_include_HEADERS = zconf.h ++ ++dist_man_MANS = zlib.3 ++ ++## libminizip: ++ ++lib_LTLIBRARIES += libminizip.la ++ ++libminizip_la_SOURCES = \ ++ contrib/minizip/ioapi.c \ ++ contrib/minizip/mztools.c \ ++ contrib/minizip/unzip.c \ ++ contrib/minizip/zip.c ++ ++# do not build the static version of libminizip ++libminizip_la_CFLAGS = -shared ++libminizip_la_LDFLAGS = -version-info 1:0:0 -no-undefined ++libminizip_la_LIBADD = libz.la ++ ++minizip_includedir = $(includedir)/minizip ++minizip_include_HEADERS = \ ++ contrib/minizip/crypt.h \ ++ contrib/minizip/ioapi.h \ ++ contrib/minizip/mztools.h \ ++ contrib/minizip/unzip.h \ ++ contrib/minizip/zip.h ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = minizip.pc ++ ++EXTRA_PROGRAMS = miniunzip minizip ++ ++miniunzip_SOURCES = contrib/minizip/miniunz.c ++miniunzip_LDADD = libminizip.la ++ ++minizip_SOURCES = contrib/minizip/minizip.c ++minizip_LDADD = libminizip.la +diff -urN zlib-1.2.3.orig/configure.ac zlib-1.2.3.kasal/configure.ac +--- zlib-1.2.3.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ zlib-1.2.3.kasal/configure.ac 2009-03-17 17:28:41.000000000 +0100 +@@ -0,0 +1,13 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_INIT([zlib], [1.2.5], [bugzilla.redhat.com]) ++AC_CONFIG_SRCDIR([gzlib.c]) ++AC_CONFIG_MACRO_DIR([m4]) ++AM_INIT_AUTOMAKE([foreign]) ++LT_INIT ++ ++AC_SUBST([HAVE_UNISTD_H], [0]) ++AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) ++AC_CONFIG_FILES([Makefile minizip.pc zlib.pc zconf.h:zconf.h.in]) ++AC_OUTPUT +diff -urN zlib-1.2.3.orig/minizip.pc.in zlib-1.2.3.kasal/minizip.pc.in +--- zlib-1.2.3.orig/minizip.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ zlib-1.2.3.kasal/minizip.pc.in 2009-01-07 15:49:34.000000000 +0100 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@/minizip ++ ++Name: minizip ++Description: Minizip zip file manipulation library ++Requires: ++Version: @PACKAGE_VERSION@ ++Libs: -L${libdir} -lminizip -lz ++Cflags: -I${includedir} +--- zlib-1.2.3.orig/zlib.pc.in.orig 2011-08-12 13:00:47.043690473 +0200 ++++ zlib-1.2.3/zlib.pc.in 2011-08-12 13:01:00.874943334 +0200 +@@ -1,7 +1,6 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-sharedlibdir=@sharedlibdir@ + includedir=@includedir@ + + Name: zlib +@@ -9,5 +8,5 @@ + Version: @VERSION@ + + Requires: +-Libs: -L${libdir} -L${sharedlibdir} -lz ++Libs: -L${libdir} -lz + Cflags: -I${includedir} diff --git a/sources b/sources index c00fef0..837af02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c735eab2d659a96e5a594c9e8541ad63 zlib-1.2.5.tar.gz +60df6a37c56e7c1366cca812414f7b85 zlib-1.2.7.tar.gz diff --git a/zlib-1.2.5-gentoo.patch b/zlib-1.2.5-gentoo.patch deleted file mode 100644 index 82c7f39..0000000 --- a/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-1.2.5-use-correct-def-file.patch b/zlib-1.2.5-use-correct-def-file.patch deleted file mode 100644 index 42cb76e..0000000 --- a/zlib-1.2.5-use-correct-def-file.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- 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 -+LIBRARY zlib1.dll - ; zlib data compression library - - EXPORTS diff --git a/zlib-1.2.7-use-correct-def-file.patch b/zlib-1.2.7-use-correct-def-file.patch new file mode 100644 index 0000000..5cf1923 --- /dev/null +++ b/zlib-1.2.7-use-correct-def-file.patch @@ -0,0 +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,3 +1,4 @@ ++LIBRARY zlib1.dll + ; zlib data compression library + EXPORTS + ; basic functions