rpms/mingw-zlib
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop minizip subpackages, it's a separate package now

Browse Source
This commit is contained in:
Sandro Mani 2020-11-12 22:22:40 +01:00
parent e42cf439e0
commit 94f4017b6f
4 changed files with 45 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
mingw-zlib.spec
View File

@ -1,15 +1,13 @@
%?mingw_package_header %{?mingw_package_header}
Name: mingw-zlib Name: mingw-zlib
Version: 1.2.11 Version: 1.2.11
Release: 3%{?dist} Release: 4%{?dist}
Summary: MinGW Windows zlib compression library Summary: MinGW Windows zlib compression library
License: zlib License: zlib
URL: http://www.zlib.net/ URL: http://www.zlib.net/
Source0: http://www.zlib.net/zlib-%{version}.tar.xz Source0: http://www.zlib.net/zlib-%{version}.tar.xz
# https://github.com/madler/zlib/pull/210
Patch0: zlib-1.2.5-minizip-fixuncrypt.patch
# Replace the zlib build system with an autotools based one # Replace the zlib build system with an autotools based one
Patch3: mingw32-zlib-1.2.7-autotools.patch Patch3: mingw32-zlib-1.2.7-autotools.patch
# The .def file contains an empty LIBRARY line which isn't valid # The .def file contains an empty LIBRARY line which isn't valid
@ -54,13 +52,6 @@ Requires: mingw32-zlib = %{version}-%{release}
The mingw32-zlib-static package contains static library for mingw32-zlib development. The mingw32-zlib-static package contains static library for mingw32-zlib development.
%package -n mingw32-minizip
Summary: Minizip manipulates files from a .zip archive
Requires: mingw32-zlib = %{version}-%{release}
%description -n mingw32-minizip
MinGW Minizip manipulates files from a .zip archive.
# Win64 # Win64
%package -n mingw64-zlib %package -n mingw64-zlib
Summary: MinGW Windows zlib compression library for the win64 target Summary: MinGW Windows zlib compression library for the win64 target
@ -75,20 +66,12 @@ Requires: mingw64-zlib = %{version}-%{release}
%description -n mingw64-zlib-static %description -n mingw64-zlib-static
The mingw64-zlib-static package contains static library for mingw64-zlib development. The mingw64-zlib-static package contains static library for mingw64-zlib development.
%package -n mingw64-minizip
Summary: Minizip manipulates files from a .zip archive
Requires: mingw64-zlib = %{version}-%{release}
%description -n mingw64-minizip %{?mingw_debug_package}
MinGW Minizip manipulates files from a .zip archive.
%?mingw_debug_package
%prep %prep
%setup -q -n zlib-%{version} %setup -q -n zlib-%{version}
%patch0 -p1 -b .fixuncrypt
%patch3 -p1 -b .atools %patch3 -p1 -b .atools
%patch5 -p1 -b .def %patch5 -p1 -b .def
# patch cannot create an empty dir # patch cannot create an empty dir
@ -102,7 +85,7 @@ autoreconf --install --force
%build %build
%mingw_configure %mingw_configure
%mingw_make %{?_smp_mflags} %mingw_make_build
%install %install
@ -110,26 +93,26 @@ autoreconf --install --force
# but this isn't created anymore due to patch #6 # but this isn't created anymore due to patch #6
# Fool libtool until a proper fix has been found # Fool libtool until a proper fix has been found
touch build_win32/.libs/libz-1.dll build_win64/.libs/libz-1.dll touch build_win32/.libs/libz-1.dll build_win64/.libs/libz-1.dll
%mingw_make_install DESTDIR=$RPM_BUILD_ROOT %mingw_make_install
# Manually install the correct zlib.dll # Manually install the correct zlib.dll
install -m 0644 build_win32/.libs/zlib1.dll $RPM_BUILD_ROOT%{mingw32_bindir}/ install -m 0644 build_win32/.libs/zlib1.dll %{buildroot}%{mingw32_bindir}/
install -m 0644 build_win64/.libs/zlib1.dll $RPM_BUILD_ROOT%{mingw64_bindir}/ install -m 0644 build_win64/.libs/zlib1.dll %{buildroot}%{mingw64_bindir}/
# Install the pkgconfig file # Install the pkgconfig file
install -m 0644 build_win32/zlib.pc $RPM_BUILD_ROOT%{mingw32_libdir}/pkgconfig/ install -Dm 0644 build_win32/zlib.pc %{buildroot}%{mingw32_libdir}/pkgconfig/zlib.pc
install -m 0644 build_win64/zlib.pc $RPM_BUILD_ROOT%{mingw64_libdir}/pkgconfig/ install -Dm 0644 build_win64/zlib.pc %{buildroot}%{mingw64_libdir}/pkgconfig/zlib.pc
# Drop the fake libz-1.dll # Drop the fake libz-1.dll
rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/libz-1.dll rm -f %{buildroot}%{mingw32_bindir}/libz-1.dll
rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/libz-1.dll rm -f %{buildroot}%{mingw64_bindir}/libz-1.dll
# Drop all .la files # Drop all .la files
find $RPM_BUILD_ROOT -name "*.la" -delete find %{buildroot} -name "*.la" -delete
# Drop the man pages # Drop the man pages
rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} rm -rf %{buildroot}%{mingw32_mandir}
rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} rm -rf %{buildroot}%{mingw64_mandir}
# Win32 # Win32
@ -143,13 +126,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
%files -n mingw32-zlib-static %files -n mingw32-zlib-static
%{mingw32_libdir}/libz.a %{mingw32_libdir}/libz.a
%files -n mingw32-minizip
%{mingw32_libdir}/libminizip.dll.a
%{mingw32_bindir}/libminizip-1.dll
%dir %{mingw32_includedir}/minizip
%{mingw32_includedir}/minizip/*.h
%{mingw32_libdir}/pkgconfig/minizip.pc
# Win64 # Win64
%files -n mingw64-zlib %files -n mingw64-zlib
%{mingw64_includedir}/zconf.h %{mingw64_includedir}/zconf.h
@ -161,15 +137,11 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
%files -n mingw64-zlib-static %files -n mingw64-zlib-static
%{mingw64_libdir}/libz.a %{mingw64_libdir}/libz.a
%files -n mingw64-minizip
%{mingw64_libdir}/libminizip.dll.a
%{mingw64_bindir}/libminizip-1.dll
%dir %{mingw64_includedir}/minizip
%{mingw64_includedir}/minizip/*.h
%{mingw64_libdir}/pkgconfig/minizip.pc
%changelog %changelog
* Thu Nov 12 2020 Sandro Mani <manisandro@gmail.com> - 1.2.11-4
- Drop minizip subpackages, it's a separate package now
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-3 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

97
mingw32-zlib-1.2.7-autotools.patch
View File

@ -1,7 +1,24 @@
diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am diff -rupN --no-dereference zlib-1.2.11/configure.ac zlib-1.2.11-new/configure.ac
--- zlib-1.2.3.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 --- zlib-1.2.11/configure.ac 1970-01-01 01:00:00.000000000 +0100
+++ zlib-1.2.3.kasal/Makefile.am 2009-03-17 17:58:36.000000000 +0100 +++ zlib-1.2.11-new/configure.ac 2020-11-12 22:09:58.320508742 +0100
@@ -0,0 +1,70 @@ @@ -0,0 +1,13 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_INIT([zlib], [1.2.11], [bugzilla.redhat.com])
+AC_CONFIG_SRCDIR([gzlib.c])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+LT_INIT
+
+AC_SUBST([HAVE_UNISTD_H], [0])
+AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
+AC_CONFIG_FILES([Makefile zlib.pc zconf.h:zconf.h.in])
+AC_OUTPUT
diff -rupN --no-dereference zlib-1.2.11/Makefile.am zlib-1.2.11-new/Makefile.am
--- zlib-1.2.11/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ zlib-1.2.11-new/Makefile.am 2020-11-12 22:09:58.320508742 +0100
@@ -0,0 +1,37 @@
+ACLOCAL_AMFLAGS = -I m4 --install +ACLOCAL_AMFLAGS = -I m4 --install
+ +
+lib_LTLIBRARIES = libz.la +lib_LTLIBRARIES = libz.la
@ -39,73 +56,9 @@ diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am
+ +
+dist_man_MANS = zlib.3 +dist_man_MANS = zlib.3
+ +
+## libminizip: diff -rupN --no-dereference zlib-1.2.11/zlib.pc.in zlib-1.2.11-new/zlib.pc.in
+ --- zlib-1.2.11/zlib.pc.in 2010-04-18 08:48:15.000000000 +0200
+lib_LTLIBRARIES += libminizip.la +++ zlib-1.2.11-new/zlib.pc.in 2020-11-12 22:09:58.320508742 +0100
+
+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.11], [bugzilla.redhat.com])
+AC_CONFIG_SRCDIR([gzlib.c])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+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 @@ @@ -1,7 +1,6 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
@ -114,7 +67,7 @@ diff -urN zlib-1.2.3.orig/minizip.pc.in zlib-1.2.3.kasal/minizip.pc.in
includedir=@includedir@ includedir=@includedir@
Name: zlib Name: zlib
@@ -9,5 +8,5 @@ @@ -9,5 +8,5 @@ Description: zlib compression library
Version: @VERSION@ Version: @VERSION@
Requires: Requires:

14
zlib-1.2.5-minizip-fixuncrypt.patch
View File

@ -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"

7
zlib-1.2.7-use-correct-def-file.patch
View File

@ -1,7 +1,6 @@
diff --git a/win32/zlib.def b/win32/zlib.def diff -rupN --no-dereference zlib-1.2.11/win32/zlib.def zlib-1.2.11-new/win32/zlib.def
index 784b138..e858d1e 100644 --- zlib-1.2.11/win32/zlib.def 2017-01-01 08:37:10.000000000 +0100
--- a/win32/zlib.def +++ zlib-1.2.11-new/win32/zlib.def 2020-11-12 22:09:58.338508692 +0100
+++ b/win32/zlib.def
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+LIBRARY zlib1.dll +LIBRARY zlib1.dll
; zlib data compression library ; zlib data compression library