commit 2333169c09a99a357b0aaa58e0bd7dfda0932685
Author: Erik van Pienbroek <[email protected]>
Date: Thu Nov 22 00:30:30 2012 +0100
Update to 1.2.7
.gitignore | 1 +
mingw-zlib.spec | 17 +++++++----------
...ols.patch => mingw32-zlib-1.2.7-autotools.patch | 2 +-
sources | 2 +-
zlib-1.2.5-gentoo.patch | 12 ------------
....patch => zlib-1.2.7-use-correct-def-file.patch | 5 ++---
6 files changed, 12 insertions(+), 27 deletions(-)
---
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 <[email protected]> - 1.2.7-1
+- Update to 1.2.7
+
* Fri Jul 20 2012 Fedora Release Engineering <[email protected]>
- 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.7-autotools.patch
similarity index 99%
rename from mingw32-zlib-1.2.5-autotools.patch
rename to mingw32-zlib-1.2.7-autotools.patch
index a3c429e..76e69d7 100644
--- a/mingw32-zlib-1.2.5-autotools.patch
+++ b/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
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-use-correct-def-file.patch
b/zlib-1.2.7-use-correct-def-file.patch
similarity index 85%
rename from zlib-1.2.5-use-correct-def-file.patch
rename to zlib-1.2.7-use-correct-def-file.patch
index 42cb76e..5cf1923 100644
--- a/zlib-1.2.5-use-correct-def-file.patch
+++ b/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
_______________________________________________
mingw mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/mingw
