From 0488afd5c9489f54838da2333d4ac365fefdd1a2 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 11:10:36 +0000 Subject: [PATCH] import CS mingw-zlib-1.3.1-1.el9 --- .gitignore | 2 +- .mingw-zlib.metadata | 2 +- SOURCES/mingw-zlib-cmake.patch | 10 +++++----- SPECS/mingw-zlib.spec | 20 ++++++++++++++++---- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 90c3145..71b23c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/zlib-1.2.13.tar.xz +SOURCES/zlib-1.3.1.tar.xz diff --git a/.mingw-zlib.metadata b/.mingw-zlib.metadata index 4fe9bb3..a4b5106 100644 --- a/.mingw-zlib.metadata +++ b/.mingw-zlib.metadata @@ -1 +1 @@ -b459b42aa533968ae403c0002a255d62d3136954 SOURCES/zlib-1.2.13.tar.xz +30b78dfdbe5d23d697738eb175ed34a3c4c2b561 SOURCES/zlib-1.3.1.tar.xz diff --git a/SOURCES/mingw-zlib-cmake.patch b/SOURCES/mingw-zlib-cmake.patch index 4ed1940..923bac7 100644 --- a/SOURCES/mingw-zlib-cmake.patch +++ b/SOURCES/mingw-zlib-cmake.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference zlib-1.2.13/CMakeLists.txt zlib-1.2.13-new/CMakeLists.txt ---- zlib-1.2.13/CMakeLists.txt 2022-10-13 07:06:55.000000000 +0200 -+++ zlib-1.2.13-new/CMakeLists.txt 2022-12-13 09:35:24.752040574 +0100 -@@ -163,12 +163,16 @@ if(NOT CYGWIN) +diff -rupN --no-dereference zlib-1.3.1/CMakeLists.txt zlib-1.3.1-new/CMakeLists.txt +--- zlib-1.3.1/CMakeLists.txt 2024-01-22 19:32:37.000000000 +0100 ++++ zlib-1.3.1-new/CMakeLists.txt 2024-01-31 17:58:11.511530357 +0100 +@@ -167,12 +167,16 @@ if(NOT CYGWIN) set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) endif() @@ -9,7 +9,7 @@ diff -rupN --no-dereference zlib-1.2.13/CMakeLists.txt zlib-1.2.13-new/CMakeList +if(UNIX OR MINGW) # On unix-like platforms the library is almost always called libz set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) - if(NOT APPLE) + if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") endif() + if(MINGW) diff --git a/SPECS/mingw-zlib.spec b/SPECS/mingw-zlib.spec index ef9ee2d..89fee64 100644 --- a/SPECS/mingw-zlib.spec +++ b/SPECS/mingw-zlib.spec @@ -1,13 +1,13 @@ %{?mingw_package_header} Name: mingw-zlib -Version: 1.2.13 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: MinGW Windows zlib compression library License: Zlib -URL: http://www.zlib.net/ -Source0: http://www.zlib.net/zlib-%{version}.tar.xz +URL: https://www.zlib.net/ +Source0: https://www.zlib.net/zlib-%{version}.tar.xz # Use UNIX naming convention for libraries Patch0: mingw-zlib-cmake.patch @@ -105,6 +105,18 @@ rm -rf %{buildroot}%{mingw64_mandir} %changelog +* Wed Jan 31 2024 Sandro Mani - 1.3.1-1 +- Update to 1.3.1 + +* Thu Jan 25 2024 Fedora Release Engineering - 1.2.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.2.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.2.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.2.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild