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

Rebase to Fedora Rawhide

Browse Source 
last_sync: 6cc69ea780
resolves: RHEL-24377
side-tag: c9s-build-side-2893-stack-gate
This commit is contained in:
Miroslav Rezanina 2024-02-06 14:24:55 +01:00
parent c6ee063186
commit ebf987e4d2
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ zlib-1.2.3.tar.gz
/zlib-1.2.11.tar.xz
/zlib-1.2.12.tar.xz
/zlib-1.2.13.tar.xz
/zlib-1.3.1.tar.xz

10
mingw-zlib-cmake.patch
View File

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

20
mingw-zlib.spec
View File

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

2
sources
View File

@ -1 +1 @@
SHA512 (zlib-1.2.13.tar.xz) = 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
SHA512 (zlib-1.3.1.tar.xz) = 1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b04680be501736e7d536b4191e2f99767e7001ca486cd802362cca2be05d5d409b83ea732d