diff --git a/6.0.10.tar.gz b/6.0.10.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0c366251d5ad0f6fdbf8d72c536f3a9f82db0d55 Binary files /dev/null and b/6.0.10.tar.gz differ diff --git a/deepin-reader-5.9.9.tar.gz b/deepin-reader-5.9.9.tar.gz deleted file mode 100644 index 5094d6e59a182578863c5678ac510e80c71dffab..0000000000000000000000000000000000000000 Binary files a/deepin-reader-5.9.9.tar.gz and /dev/null differ diff --git a/deepin-reader.spec b/deepin-reader.spec index 794d4c64d8f5bc9a767eea8d68c3c068f8ef5d1b..f80efc6370a447ea004fa5db7514bd2d60029ae0 100644 --- a/deepin-reader.spec +++ b/deepin-reader.spec @@ -1,24 +1,23 @@ -#%%global debug_package %{nil} -%define specrelease 6%{?dist} -%if 0%{?openeuler} -%define specrelease 6 -%endif +%global debug_package %{nil} +ExcludeArch: sw_64 Name: deepin-reader -Version: 5.9.9 -Release: %{specrelease} +Version: 6.0.10 +Release: 1%{?dist}.01 Summary: A simple PDF reader, supporting bookmarks, highlights and annotations -License: GPLv3+ -URL: https://github.com/linuxdeepin/%{name} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +License: GPL-3.0-or-later +URL: https://github.com/linuxdeepin/deepin-reader +Source0: %{url}/archive/refs/tags/%{version}.tar.gz BuildRequires: gcc-c++ +BuildRequires: make BuildRequires: cmake BuildRequires: qt5-devel BuildRequires: dtkwidget-devel BuildRequires: dtkcore-devel BuildRequires: dtkgui-devel +#BuildRequires: pkgconfig(dtkwidget) BuildRequires: pkgconfig(ddjvuapi) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(libjpeg) @@ -36,12 +35,19 @@ BuildRequires: libX11-devel BuildRequires: qt5-qtbase-private-devel BuildRequires: chrpath BuildRequires: fdupes +# deepin-pdfium +BuildRequires: libchardet-devel +BuildRequires: libicu-devel +BuildRequires: cmake(qt5webenginewidgets) +BuildRequires: gtest-devel %description %{summary}. %prep %autosetup +# fix c++ version +sed -i 's/c++11/c++17/' reader/reader.pro tests/tests.pro htmltopdf/htmltopdf.pro %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -54,33 +60,6 @@ popd %install %make_install -C build INSTALL_ROOT="%buildroot" -pushd %{buildroot}/usr/lib/%{name} -mapfile -t dups <<<"$(fdupes -1 .)" -for line in "${dups[@]}"; do - realfile="$(echo "${line}" | tr '[:space:]' '\n' | sort -r | head -1)" - mapfile -t dupes <<<"$(echo "${line}" | tr '[:space:]' '\n' | sort -r | tail --lines=+2)" - for dup in "${dupes[@]}"; do - test -z "${dup}" && continue - ln -s -f "${realfile}" "${dup}" - done -done -popd - -# remove rpath info -for file in $(find %{buildroot}/ -executable -type f -exec file {} ';' | grep "\" | awk -F ':' '{print $1}') -do - if [ ! -u "$file" ]; then - if [ -w "$file" ]; then - chrpath -d $file - fi - fi -done - -# add rpath path in ld.so.conf.d -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_bindir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf -echo "/usr/lib/%{name}" >> %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf - %files %doc README.md %license LICENSE @@ -88,12 +67,14 @@ echo "/usr/lib/%{name}" >> %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/%{name}/translations/*.qm %{_datadir}/applications/%{name}.desktop -# /usr/lib/libdeepin-pdfium.* +/usr/lib/deepin-reader/htmltopdf +/usr/lib/libdeepin-pdfium.* %{_datadir}/deepin-manual/manual-assets/application/deepin-reader/document-viewer/* -/usr/lib/deepin-reader/libdeepin-poppler* -%config(noreplace) /etc/ld.so.conf.d/%{name}-%{_arch}.conf %changelog +* Mon Oct 27 2025 zhuhongbo - 6.0.10-1.01 +- fix: fix CVE-2023-50254 + * Tue May 30 2023 leeffo - 5.9.9-6 - fix: fix install warning