From b4e8440ce889c05a8ba6a3ba69f3e8219c69c7e9 Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Tue, 9 Apr 2024 17:28:32 +0000
Subject: [PATCH] import mingw-zlib-1.3.1-1.el9
---
.mingw-zlib.checksum | 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/.mingw-zlib.checksum b/.mingw-zlib.checksum
index 0046b22..4b72c9c 100644
--- a/.mingw-zlib.checksum
+++ b/.mingw-zlib.checksum
@@ -1 +1 @@
-0354e310d90a9dc0b642a3e4881f772a519ee314238489b47ba839fc94f6534a
+4c90480016d3ade4bf249441b2e5fa4aa039675d9a01c11f0d3e651127accedf
diff --git a/.mingw-zlib.metadata b/.mingw-zlib.metadata
index d638e10..61621bc 100644
--- a/.mingw-zlib.metadata
+++ b/.mingw-zlib.metadata
@@ -1 +1 @@
-d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 SOURCES/zlib-1.2.13.tar.xz
+38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32 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 <manisandro@gmail.com> - 1.3.1-1
+- Update to 1.3.1
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
--
GitLab