From 752c32842bab411aae12170f3fd68ece424340ec Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] Consider native package patches. --- zlib/mingw32-zlib.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/zlib/mingw32-zlib.spec b/zlib/mingw32-zlib.spec index d43344c..729a72a 100644 --- a/zlib/mingw32-zlib.spec +++ b/zlib/mingw32-zlib.spec @@ -6,23 +6,28 @@ Name: mingw32-zlib Version: 1.2.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: MinGW Windows zlib compression library License: zlib Group: Development/Libraries URL: http://www.zlib.net/ Source0: http://www.zlib.net/zlib-%{version}.tar.gz -Patch1: zlib-win32.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +# From Fedora native package, none is applicable to us. +#Patch3: zlib-1.2.3-autotools.patch +#Patch4: minizip-1.2.3-autotools.patch +#Patch5: zlib-1.2.3-minizip.patch + +# MinGW-specific patches. +Patch100: zlib-win32.patch + BuildRequires: mingw32-filesystem >= 23 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils -## For some reason mingw32-find-provides doesn't get this. -#Provides: mingw32(zlib1.dll) %description MinGW Windows zlib compression library. @@ -30,7 +35,8 @@ MinGW Windows zlib compression library. %prep %setup -q -n zlib-1.2.3 -%patch1 -p1 + +%patch100 -p1 %build @@ -82,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 16 2008 Richard W.M. Jones - 1.2.3-10 +- Consider native patches. + * Wed Sep 24 2008 Richard W.M. Jones - 1.2.3-9 - Rename mingw -> mingw32. -- 1.8.3.1