diff --git a/v0.13.79.tar.gz b/v0.13.79.tar.gz deleted file mode 100644 index 08d8951aab292924a30c8e7f84927aeb30f0c0c1..0000000000000000000000000000000000000000 Binary files a/v0.13.79.tar.gz and /dev/null differ diff --git a/v0.13.80.tar.gz b/v0.13.80.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..553e13ddb5e1c1250d741a6e7818411489cacbf1 Binary files /dev/null and b/v0.13.80.tar.gz differ diff --git a/zziplib-0.13.78-fix-pkgconfig-pkgname.patch b/zziplib-0.13.78-fix-pkgconfig-pkgname.patch deleted file mode 100644 index c874b9e7c5375766fdbd51a6dc3fd45241067ce3..0000000000000000000000000000000000000000 --- a/zziplib-0.13.78-fix-pkgconfig-pkgname.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e42966eaa85f81e14de2c17627435c3ca7830410 Mon Sep 17 00:00:00 2001 -From: fundawang -Date: Wed, 21 Aug 2024 14:02:47 +0800 -Subject: [PATCH] Requires sdl2 rather than sdl for pkgconfig file - ---- - SDL/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt -index 0f603b3..22bd570 100644 ---- a/SDL/CMakeLists.txt -+++ b/SDL/CMakeLists.txt -@@ -65,7 +65,7 @@ add_custom_command(OUTPUT SDL_rwops_zzip.pc - COMMAND ${BASH} -c "echo 'Name: SDL_rwops_zzip' >> SDL_rwops_zzip.pc" - COMMAND ${BASH} -c "echo 'Version: ${PROJECT_VERSION}' >> SDL_rwops_zzip.pc" - COMMAND ${BASH} -c "echo 'Description: SDL_rwops for ZZipLib' >> SDL_rwops_zzip.pc" -- COMMAND ${BASH} -c "echo 'Requires: sdl, zziplib' >> SDL_rwops_zzip.pc" -+ COMMAND ${BASH} -c "echo 'Requires: sdl2, zziplib' >> SDL_rwops_zzip.pc" - COMMAND ${BASH} -c "echo 'Cflags: -I\${zzipsdldir}' >> SDL_rwops_zzip.pc" - VERBATIM) - add_custom_target(pkgconfig-sdl ALL DEPENDS SDL_rwops_zzip.pc) diff --git a/zziplib-0.13.79-install-pkgconfig-files-into-libdir.patch b/zziplib-0.13.79-install-pkgconfig-files-into-libdir.patch deleted file mode 100644 index bd0b50903329482c27733578c819dec0a35e1393..0000000000000000000000000000000000000000 --- a/zziplib-0.13.79-install-pkgconfig-files-into-libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index 646903b..c300011 100644 ---- a/zzip/CMakeLists.txt -+++ b/zzip/CMakeLists.txt -@@ -304,7 +304,7 @@ set(outdir ${CMAKE_CURRENT_BINARY_DIR}) - - if(ZZIP_PKGCONFIG) - install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko.pc -- DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ) -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" ) - endif() - - install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) diff --git a/zziplib-0.13.79-port-to-newer-cmake.patch b/zziplib-0.13.80-port-to-newer-cmake.patch similarity index 88% rename from zziplib-0.13.79-port-to-newer-cmake.patch rename to zziplib-0.13.80-port-to-newer-cmake.patch index 6db295d8e15a73c4624cf27d92ac16ea4607300d..1a33bd0afa6830ac8fcb452be532554338b889d0 100644 --- a/zziplib-0.13.79-port-to-newer-cmake.patch +++ b/zziplib-0.13.80-port-to-newer-cmake.patch @@ -1,11 +1,11 @@ diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt -index 3092c66..417df6e 100644 +index 6ad5651..b5d318e 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.10) +cmake_minimum_required (VERSION 3.12) - project(zzipbins VERSION "0.13.79" LANGUAGES C) + project(zzipbins VERSION "0.13.80" LANGUAGES C) include ( GNUInstallDirs ) @@ -20,7 +20,7 @@ endif() @@ -27,13 +27,13 @@ index 3092c66..417df6e 100644 set(mandir ${CMAKE_INSTALL_FULL_MANDIR}) set(docdir ${CMAKE_INSTALL_FULL_DOCDIR}) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index ca3bac0..080a1a8 100644 +index 92dfc79..da75c06 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.10) +cmake_minimum_required (VERSION 3.12) - project(zziptest VERSION "0.13.79" LANGUAGES C) + project(zziptest VERSION "0.13.80" LANGUAGES C) if(NOT CMAKE_BUILD_TYPE) @@ -28,14 +28,14 @@ endif() @@ -47,7 +47,7 @@ index ca3bac0..080a1a8 100644 find_program ( UNZIP unzip) set(EXEEXT ${CMAKE_EXECUTABLE_SUFFIX}) - set(README ${CMAKE_SOURCE_DIR}/README) + set(README ${CMAKE_CURRENT_SOURCE_DIR}/README) -set(PY ${PYTHON_EXECUTABLE}) +set(PY ${Python_EXECUTABLE}) set(outdir ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/zziplib.spec b/zziplib.spec index a227c910a640587bbf301ed36f819fd90a04e93f..6ec3fcbf8505dcb2faf71805e687e63f31dc1837 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,13 +1,11 @@ Name: zziplib -Version: 0.13.79 +Version: 0.13.80 Release: 1 Summary: Lightweight library for zip compression License: LGPL-2.0-or-later OR MPL-1.1 URL: https://zziplib.sourceforge.net Source0: https://github.com/gdraheim/zziplib/archive/refs/tags/v%{version}.tar.gz -Patch0: zziplib-0.13.78-fix-pkgconfig-pkgname.patch -Patch1: zziplib-0.13.79-port-to-newer-cmake.patch -Patch2: zziplib-0.13.79-install-pkgconfig-files-into-libdir.patch +Patch0: zziplib-0.13.80-port-to-newer-cmake.patch BuildRequires: gcc make BuildRequires: cmake >= 3.12 BuildRequires: zlib-devel @@ -45,7 +43,7 @@ library. %files %license docs/COPYING.LIB docs/COPYING.MPL -%doc ChangeLog README TODO +%doc ChangeLog README.MD TODO %{_bindir}/* %{_libdir}/*.so.* @@ -54,6 +52,7 @@ library. %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%{_datadir}/pkgconfig/*.pc %{_datadir}/aclocal/*.m4 %{_libdir}/cmake/* @@ -61,6 +60,9 @@ library. %{_mandir}/man3/* %changelog +* Mon Jun 02 2025 Funda Wang - 0.13.80-1 +- update to 0.13.80 + * Wed Apr 23 2025 Funda Wang - 0.13.79-1 - update to 0.13.79