diff options
| -rw-r--r-- | cygwin-zlib.spec | 72 | ||||
| -rw-r--r-- | sources | 1 | ||||
| -rw-r--r-- | zlib-1.2.5-minizip-fixuncrypt.patch | 14 | ||||
| -rw-r--r-- | zlib-1.2.7-minizip-cygwin.patch | 69 |
4 files changed, 12 insertions, 144 deletions
diff --git a/cygwin-zlib.spec b/cygwin-zlib.spec index a10875c..428efdd 100644 --- a/cygwin-zlib.spec +++ b/cygwin-zlib.spec @@ -2,17 +2,15 @@ Name: cygwin-zlib Version: 1.2.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cygwin zlib compression library License: zlib Group: Development/Libraries -URL: http://www.zlib.net/ +URL: https://zlib.net/ BuildArch: noarch -Source0: http://www.zlib.net/zlib-%{version}.tar.gz -Patch0: zlib-1.2.5-minizip-fixuncrypt.patch -Patch100: zlib-1.2.7-minizip-cygwin.patch +Source0: https://zlib.net/zlib-%{version}.tar.gz Patch101: zlib-1.2.8-vpath.patch Patch102: zlib-1.2.11-gzopen_w.patch @@ -24,7 +22,7 @@ BuildRequires: cygwin64-filesystem >= 11 BuildRequires: cygwin64-gcc BuildRequires: cygwin64-binutils -BuildRequires: autoconf automake cygwin-libtool-base +BuildRequires: make %description Cygwin zlib compression library. @@ -59,42 +57,19 @@ Requires: cygwin64-zlib = %{version}-%{release} %description -n cygwin64-zlib-static The cygwin64-zlib-static package contains static library for cygwin64-zlib development. -%package -n cygwin32-minizip -Summary: Minizip library for Cygwin32 toolchain -Group: Development/Libraries -Requires: cygwin32-zlib = %{version}-%{release} - -%description -n cygwin32-minizip -Minizip library for the Cygwin i686 cross-compiler toolchain. - -%package -n cygwin64-minizip -Summary: Minizip library for Cygwin64 toolchain -Group: Development/Libraries -Requires: cygwin64-zlib = %{version}-%{release} - -%description -n cygwin64-minizip -Minizip library for the Cygwin x86_64 cross-compiler toolchain. - %{?cygwin_debug_package} %prep -%setup -q -n zlib-%{version} -%patch0 -p1 -%patch100 -p2 -%patch101 -p2 -%patch102 -p2 +%autosetup -p2 -n zlib-%{version} iconv -f windows-1252 -t utf-8 <ChangeLog >ChangeLog.tmp -pushd contrib/minizip -%cygwin_autoreconf -popd %build mkdir -p build_32bit pushd build_32bit -ln -s ../zlib.h ../zconf.h ../zlib.pc.in . -../configure +ln -s ../zlib.h ../zlib.pc.in . +CHOST=%{cygwin32_target} ../configure make -f ../win32/Makefile.gcc \ CC=%{cygwin32_cc} AR=%{cygwin32_ar} RC=%{cygwin32_windres} STRIP=: \ CFLAGS="%{cygwin32_cflags}" \ @@ -105,8 +80,8 @@ popd mkdir -p build_64bit pushd build_64bit -ln -s ../zlib.h ../zconf.h ../zlib.pc.in . -../configure +ln -s ../zlib.h ../zlib.pc.in . +CHOST=%{cygwin64_target} ../configure make -f ../win32/Makefile.gcc \ CC=%{cygwin64_cc} AR=%{cygwin64_ar} RC=%{cygwin64_windres} STRIP=: \ CFLAGS="%{cygwin64_cflags}" \ @@ -115,13 +90,6 @@ make -f ../win32/Makefile.gcc \ all popd -pushd contrib/minizip -%cygwin_configure --disable-static -CYGWIN32_MAKE_ARGS="zlib_top_builddir=../../../build_32bit" -CYGWIN64_MAKE_ARGS="zlib_top_builddir=../../../build_64bit" -%cygwin_make %{?_smp_flags} -popd - %install pushd build_32bit @@ -150,13 +118,6 @@ make -f ../win32/Makefile.gcc \ install popd -pushd contrib/minizip -%cygwin_make install DESTDIR=$RPM_BUILD_ROOT -popd - -# We intentionally don't ship *.la files -find $RPM_BUILD_ROOT -name '*.la' -delete - # Remove the documentation and manpages which duplicate Fedora native rm -rf $RPM_BUILD_ROOT/%{cygwin32_mandir} rm -rf $RPM_BUILD_ROOT/%{cygwin64_mandir} @@ -172,12 +133,6 @@ rm -rf $RPM_BUILD_ROOT/%{cygwin64_mandir} %files -n cygwin32-zlib-static %{cygwin32_libdir}/libz.a -%files -n cygwin32-minizip -%{cygwin32_bindir}/cygminizip-1.dll -%{cygwin32_includedir}/minizip/ -%{cygwin32_libdir}/libminizip.dll.a -%{cygwin32_libdir}/pkgconfig/minizip.pc - %files -n cygwin64-zlib %{cygwin64_bindir}/cygz.dll %{cygwin64_includedir}/zconf.h @@ -188,14 +143,11 @@ rm -rf $RPM_BUILD_ROOT/%{cygwin64_mandir} %files -n cygwin64-zlib-static %{cygwin64_libdir}/libz.a -%files -n cygwin64-minizip -%{cygwin64_bindir}/cygminizip-1.dll -%{cygwin64_includedir}/minizip/ -%{cygwin64_libdir}/libminizip.dll.a -%{cygwin64_libdir}/pkgconfig/minizip.pc - %changelog +* Mon Jan 10 2022 Yaakov Selkowitz <yselkowi@redhat.com> - 1.2.11-2 +- Drop minizip subpackage. + * Tue Dec 05 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 1.2.11-1 - new version diff --git a/sources b/sources deleted file mode 100644 index d35f7a1..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -1c9f62f0778697a09d36121ead88e08e zlib-1.2.11.tar.gz diff --git a/zlib-1.2.5-minizip-fixuncrypt.patch b/zlib-1.2.5-minizip-fixuncrypt.patch deleted file mode 100644 index d113879..0000000 --- a/zlib-1.2.5-minizip-fixuncrypt.patch +++ /dev/null @@ -1,14 +0,0 @@ -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" - diff --git a/zlib-1.2.7-minizip-cygwin.patch b/zlib-1.2.7-minizip-cygwin.patch deleted file mode 100644 index 3cc37d3..0000000 --- a/zlib-1.2.7-minizip-cygwin.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- origsrc/zlib-1.2.7/contrib/minizip/Makefile.am 2012-03-26 23:17:41.000000000 -0400 -+++ src/zlib-1.2.7/contrib/minizip/Makefile.am 2012-05-13 00:10:19.745354100 -0400 -@@ -22,7 +22,8 @@ libminizip_la_SOURCES = \ - zip.c \ - ${iowin32_src} - --libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz -+libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -no-undefined -+libminizip_la_LIBADD = -lz - - minizip_includedir = $(includedir)/minizip - minizip_include_HEADERS = \ ---- origsrc/zlib-1.2.7/contrib/minizip/ioapi.c 2012-01-21 14:58:45.000000000 -0500 -+++ src/zlib-1.2.7/contrib/minizip/ioapi.c 2012-05-13 00:10:19.759354900 -0400 -@@ -14,8 +14,9 @@ - #define _CRT_SECURE_NO_WARNINGS - #endif - --#if defined(__APPLE__) || defined(IOAPI_NO_64) -+#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__CYGWIN__) - // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions -+// Ditto cygwin. - #define FOPEN_FUNC(filename, mode) fopen(filename, mode) - #define FTELLO_FUNC(stream) ftello(stream) - #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) ---- origsrc/zlib-1.2.7/contrib/minizip/miniunz.c 2010-07-18 12:04:24.000000000 -0400 -+++ src/zlib-1.2.7/contrib/minizip/miniunz.c 2012-05-13 00:10:19.786356400 -0400 -@@ -27,8 +27,9 @@ - #endif - #endif - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__CYGWIN__) - // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions -+// Ditto cygwin. - #define FOPEN_FUNC(filename, mode) fopen(filename, mode) - #define FTELLO_FUNC(stream) ftello(stream) - #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) -@@ -97,7 +98,7 @@ void change_file_date(filename,dosdate,t - SetFileTime(hFile,&ftm,&ftLastAcc,&ftm); - CloseHandle(hFile); - #else --#ifdef unix || __APPLE__ -+#if defined(unix) || defined(__APPLE__) - struct utimbuf ut; - struct tm newdate; - newdate.tm_sec = tmu_date.tm_sec; ---- origsrc/zlib-1.2.7/contrib/minizip/minizip.c 2012-01-21 15:00:26.000000000 -0500 -+++ src/zlib-1.2.7/contrib/minizip/minizip.c 2012-05-13 00:10:19.814358000 -0400 -@@ -28,8 +28,9 @@ - #endif - #endif - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__CYGWIN__) - // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions -+// Ditto cygwin. - #define FOPEN_FUNC(filename, mode) fopen(filename, mode) - #define FTELLO_FUNC(stream) ftello(stream) - #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) -@@ -94,7 +95,7 @@ uLong filetime(f, tmzip, dt) - return ret; - } - #else --#ifdef unix || __APPLE__ -+#if defined(unix) || defined(__APPLE__) - uLong filetime(f, tmzip, dt) - char *f; /* name of file to get info on */ - tm_zip *tmzip; /* return value: access, modific. and creation times */ |