diff --git a/zziplib-0.13.78-fix-pkg-search_module.patch b/zziplib-0.13.78-fix-pkg-search_module.patch deleted file mode 100644 index d04580790f85b58866f56301a173cefbae292e33..0000000000000000000000000000000000000000 --- a/zziplib-0.13.78-fix-pkg-search_module.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zziplib-0.13.78/SDL/CMakeLists.txt.orig 2024-08-21 14:05:02.107308600 +0800 -+++ zziplib-0.13.78/SDL/CMakeLists.txt 2024-08-21 14:14:23.984453900 +0800 -@@ -25,7 +25,7 @@ - # Zlib library needed - find_package ( ZLIB REQUIRED ) - # pkg_search_module ( ZZIP zzip ) --pkg_search_module ( SDL sdl2) -+pkg_search_module ( SDL sdl) - - # targets ######################################################## - set(ZZIPSDL_SRCS diff --git a/zziplib-0.13.78-fix-pkgconfig-pkgname.patch b/zziplib-0.13.78-fix-pkgconfig-pkgname.patch new file mode 100644 index 0000000000000000000000000000000000000000..c874b9e7c5375766fdbd51a6dc3fd45241067ce3 --- /dev/null +++ b/zziplib-0.13.78-fix-pkgconfig-pkgname.patch @@ -0,0 +1,22 @@ +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.spec b/zziplib.spec index c180cca33319f96fbb8a18014ca85a71cf31dd92..312425c69a04720ef9b46af69f65f7ae9bd797dd 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,16 +1,16 @@ Name: zziplib Version: 0.13.78 -Release: 1 +Release: 2 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-pkg-search_module.patch +Patch0: zziplib-0.13.78-fix-pkgconfig-pkgname.patch BuildRequires: gcc make BuildRequires: cmake >= 3.1 BuildRequires: zlib-devel -BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(sdl2) Provides: zziplib-utils = %{version}-%{release} Obsoletes: zziplib-utils < %{version}-%{release} @@ -36,11 +36,11 @@ library. %autosetup -p1 -n %{name}-%{version} %build -%cmake -B "%{_vpath_builddir}" -DZZIP_TESTCVE=OFF -%make_build -C "%{_vpath_builddir}" +%cmake -DZZIP_TESTCVE=OFF +%cmake_build %install -%make_install -C "%{_vpath_builddir}" +%cmake_install %files %license docs/COPYING.LIB docs/COPYING.MPL @@ -60,6 +60,9 @@ library. %{_mandir}/man3/* %changelog +* Thu Nov 28 2024 Funda Wang - 0.13.78-2 +- build with sdl2 now + * Wed Aug 21 2024 Funda Wang - 0.13.78-1 - update to 0.13.78