From 73e96e70d154b8767cca1ff88f3088dcd8954615 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 4 Feb 2025 20:24:58 +0800 Subject: [PATCH] fix build with latest cmake migration --- poppler.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/poppler.spec b/poppler.spec index 590ac89..c5728d6 100644 --- a/poppler.spec +++ b/poppler.spec @@ -1,15 +1,15 @@ -%global __cmake_in_source_build 0 +%undefine __cmake_in_source_build %global test_sha ff3133cdb6cb496ee1d2c3231bfa35006a5e8410 %global qt6 1 Name: poppler Version: 24.03.0 -Release: 5 +Release: 6 Summary: PDF rendering library -License: GPLv2+ and LGPLv2+ and MIT -URL: http://poppler.freedesktop.org/ -Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz +License: (GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND MIT +URL: https://poppler.freedesktop.org/ +Source0: https://poppler.freedesktop.org/poppler-%{version}.tar.xz Source1: https://gitlab.freedesktop.org/poppler/test/-/archive/%{test_sha}/test-%{test_sha}.tar.bz2 Patch1: poppler-0.90.0-position-independent-code.patch @@ -167,7 +167,7 @@ sed -i "/check_signature_basics/d" {qt5,qt6}/tests/CMakeLists.txt -DENABLE_LIBOPENJPEG=openjpeg2 \ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ -DENABLE_ZLIB=OFF \ - -DTESTDATADIR=%{_builddir}/%{name}-%{version}/test-%{test_sha} + -DTESTDATADIR=%{_builddir}/%{buildsubdir}/test-%{test_sha} %cmake_build %install @@ -248,6 +248,9 @@ test "$(pkg-config --modversion poppler-qt6)" = "%{version}" %{_mandir}/man1/* %changelog +* Tue Feb 04 2025 Funda Wang - 24.03.0-6 +- fix build with latest cmake migration + * Tue Dec 24 2024 lingsheng - 24.03.0-5 - fix CVE-2024-56378 -- Gitee