From f5827371e9bea212b3685e4484059ba9370f5580 Mon Sep 17 00:00:00 2001 From: Peridot Bot <rockyautomation@rockylinux.org> Date: Wed, 15 Jan 2025 18:08:41 +0000 Subject: [PATCH] import mingw-zlib-1.3.1-5.el10 --- SPECS/mingw-zlib.spec | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/SPECS/mingw-zlib.spec b/SPECS/mingw-zlib.spec index ee09cf7..41e7352 100644 --- a/SPECS/mingw-zlib.spec +++ b/SPECS/mingw-zlib.spec @@ -1,8 +1,9 @@ +%global mingw_build_ucrt64 1 %{?mingw_package_header} Name: mingw-zlib Version: 1.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows zlib compression library License: Zlib @@ -22,6 +23,9 @@ BuildRequires: mingw32-gcc BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw64-gcc +BuildRequires: ucrt64-filesystem >= 95 +BuildRequires: ucrt64-gcc + %description MinGW Windows zlib compression library. @@ -58,6 +62,21 @@ Requires: mingw64-zlib = %{version}-%{release} The mingw64-zlib-static package contains static library for mingw64-zlib development. +# UCRT64 +%package -n ucrt64-zlib +Summary: MinGW Windows zlib compression library for the ucrt64 target + +%description -n ucrt64-zlib +MinGW Windows zlib compression library for the ucrt64 target. + +%package -n ucrt64-zlib-static +Summary: Static libraries for ucrt64-zlib development +Requires: ucrt64-zlib = %{version}-%{release} + +%description -n ucrt64-zlib-static +The ucrt64-zlib-static package contains static library for ucrt64-zlib development. + + %{?mingw_debug_package} @@ -68,6 +87,7 @@ The mingw64-zlib-static package contains static library for mingw64-zlib develop %build MINGW32_CMAKE_ARGS=-DINSTALL_PKGCONFIG_DIR=%{mingw32_libdir}/pkgconfig \ MINGW64_CMAKE_ARGS=-DINSTALL_PKGCONFIG_DIR=%{mingw64_libdir}/pkgconfig \ +UCRT64_CMAKE_ARGS=-DINSTALL_PKGCONFIG_DIR=%{ucrt64_libdir}/pkgconfig \ %mingw_cmake %mingw_make_build %mingw_make_build @@ -79,6 +99,7 @@ MINGW64_CMAKE_ARGS=-DINSTALL_PKGCONFIG_DIR=%{mingw64_libdir}/pkgconfig \ # Drop the man pages rm -rf %{buildroot}%{mingw32_mandir} rm -rf %{buildroot}%{mingw64_mandir} +rm -rf %{buildroot}%{ucrt64_mandir} # Win32 @@ -103,8 +124,22 @@ rm -rf %{buildroot}%{mingw64_mandir} %files -n mingw64-zlib-static %{mingw64_libdir}/libz.a +# UCRT64 +%files -n ucrt64-zlib +%{ucrt64_includedir}/zconf.h +%{ucrt64_includedir}/zlib.h +%{ucrt64_libdir}/libz.dll.a +%{ucrt64_bindir}/zlib1.dll +%{ucrt64_libdir}/pkgconfig/zlib.pc + +%files -n ucrt64-zlib-static +%{ucrt64_libdir}/libz.a %changelog +* Tue Jan 14 2025 Miroslav Rezanina <mrezanin@redhat.com> - 1.3.1-5 +- Synchronize with Fedora Rawhide + Resolves: RHEL-73826 + * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.3.1-4 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 -- GitLab