diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-03-04 12:16:51 -0600 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-03-04 12:16:51 -0600 |
| commit | 2cb3bfaf9db087343ccaafefbc9e61be5a902af4 (patch) | |
| tree | 87bd957b2b21aa27020abe2dae2b23b198487f04 | |
| parent | e48561cfefdb2a68eb59f888a95c475b05b39b62 (diff) | |
| download | cygwin-zlib-2cb3bfaf9db087343ccaafefbc9e61be5a902af4.tar.gz cygwin-zlib-2cb3bfaf9db087343ccaafefbc9e61be5a902af4.tar.xz cygwin-zlib-2cb3bfaf9db087343ccaafefbc9e61be5a902af4.zip | |
Add Fedora patches and build fixes
| -rw-r--r-- | cygwin-zlib.spec | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/cygwin-zlib.spec b/cygwin-zlib.spec index 557c7a8..322f39c 100644 --- a/cygwin-zlib.spec +++ b/cygwin-zlib.spec @@ -2,18 +2,20 @@ Name: cygwin-zlib Version: 1.2.8 -Release: 1 +Release: 2%{?dist} Summary: Cygwin zlib compression library License: zlib Group: Development/Libraries URL: http://www.zlib.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Source0: http://www.zlib.net/zlib-%{version}.tar.gz -Patch0: zlib-1.2.7-minizip-cygwin.patch -Patch1: zlib-1.2.8-vpath.patch +Patch0: zlib-1.2.5-minizip-fixuncrypt.patch +Patch2: zlib-1.2.7-z-block-flush.patch +Patch3: zlib-1.2.8-minizip-include.patch +Patch100: zlib-1.2.7-minizip-cygwin.patch +Patch101: zlib-1.2.8-vpath.patch BuildRequires: cygwin32-filesystem >= 9 BuildRequires: cygwin32-gcc @@ -86,8 +88,11 @@ Minizip library for the Cygwin x86_64 cross-compiler toolchain. %prep %setup -q -n zlib-%{version} -%patch0 -p2 -%patch1 -p2 +%patch0 -p1 +%patch2 -p1 +%patch3 -p1 +%patch100 -p2 +%patch101 -p2 iconv -f windows-1252 -t utf-8 <ChangeLog >ChangeLog.tmp sed -i -e '/gzopen_w/d' win32/zlib.def pushd contrib/minizip @@ -98,6 +103,7 @@ popd mkdir -p build_32bit pushd build_32bit ln -s ../zlib.h ../zconf.h ../zlib.pc.in . +../configure make -f ../win32/Makefile.gcc \ CC=%{cygwin32_cc} AR=%{cygwin32_ar} RC=%{cygwin32_windres} STRIP=: \ CFLAGS="%{cygwin32_cflags}" \ @@ -109,6 +115,7 @@ popd mkdir -p build_64bit pushd build_64bit ln -s ../zlib.h ../zconf.h ../zlib.pc.in . +../configure make -f ../win32/Makefile.gcc \ CC=%{cygwin64_cc} AR=%{cygwin64_ar} RC=%{cygwin64_windres} STRIP=: \ CFLAGS="%{cygwin64_cflags}" \ @@ -126,8 +133,6 @@ popd %install -rm -rf $RPM_BUILD_ROOT - pushd build_32bit make -f ../win32/Makefile.gcc \ DESTDIR=$RPM_BUILD_ROOT \ @@ -200,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT/%{cygwin64_mandir} %changelog +* Wed Mar 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 1.2.8-2 +- Add Fedora patches and build fixes + * Sun Jun 30 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.2.8-1 - Version bump. - Update for new Cygwin packaging scheme. |