diff --git a/poppler-22.08.0.tar.xz b/poppler-22.08.0.tar.xz deleted file mode 100644 index 6150273bf2a0a3afc012ab15314ebe4f8e1d60cb..0000000000000000000000000000000000000000 Binary files a/poppler-22.08.0.tar.xz and /dev/null differ diff --git a/poppler-22.11.0.tar.xz b/poppler-22.11.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..690fb42023a5388c4a2158f079a3183b6813e228 Binary files /dev/null and b/poppler-22.11.0.tar.xz differ diff --git a/poppler-test-2021-01-11-03a4b9eb854a06a83c465e82de601796c458bbe9.tar.xz b/poppler-test-2021-01-11-03a4b9eb854a06a83c465e82de601796c458bbe9.tar.xz deleted file mode 100644 index 309191432992841726336c2cc651b7177ee8a7ee..0000000000000000000000000000000000000000 Binary files a/poppler-test-2021-01-11-03a4b9eb854a06a83c465e82de601796c458bbe9.tar.xz and /dev/null differ diff --git a/poppler.spec b/poppler.spec index c493d6c85e458d3ca1858ead107f1017ffa90958..1df000919cf86c1af1daeec4b6681d71ad18f324 100644 --- a/poppler.spec +++ b/poppler.spec @@ -1,50 +1,50 @@ %define anolis_release 1 -%global test_sha 03a4b9eb854a06a83c465e82de601796c458bbe9 -%global test_date 2021-01-11 # %%global qt6 1 Summary: PDF rendering library Name: poppler -Version: 22.08.0 +Version: 22.11.0 Release: %{anolis_release}%{?dist} License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT URL: http://poppler.freedesktop.org/ Source0: https://poppler.freedesktop.org/%{name}-%{version}.tar.xz -# git archive --prefix test/ -Source1: %{name}-test-%{test_date}-%{test_sha}.tar.xz - +# test_sha 920c89f8f43bdfe8966c8e397e7f67f5302e9435 +# test_date 2022-04-24 +Source1: https://gitlab.freedesktop.org/poppler/test/-/archive/master/test-master.tar.bz2 Patch1: poppler-0.90.0-position-independent-code.patch Patch2: poppler-21.01.0-glib-introspection.patch -BuildRequires: make BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gettext-devel -BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(cairo-ft) -BuildRequires: pkgconfig(cairo-pdf) -BuildRequires: pkgconfig(cairo-ps) -BuildRequires: pkgconfig(cairo-svg) +BuildRequires: pkgconfig(cairo) >= 1.10.0 +BuildRequires: pkgconfig(cairo-ft) >= 1.10.0 +BuildRequires: pkgconfig(cairo-pdf) >= 1.10.0 +BuildRequires: pkgconfig(cairo-ps) >= 1.10.0 +BuildRequires: pkgconfig(cairo-svg) >= 1.10.0 +BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(freetype2) >= 2.8 +BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.36 +BuildRequires: pkgconfig(gio-2.0) >= 2.56 +BuildRequires: pkgconfig(glib-2.0) >= 2.56 +BuildRequires: pkgconfig(gobject-2.0) >= 2.56 +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.12 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(nss) +BuildRequires: pkgconfig(nss) >= 3.19 BuildRequires: pkgconfig(poppler-data) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(Qt5Core) >= 5.9 +BuildRequires: pkgconfig(Qt5Gui) >= 5.9 +BuildRequires: pkgconfig(Qt5Test) >= 5.9 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.9 +BuildRequires: pkgconfig(Qt5Xml) >= 5.9 %if 0%{?qt6} BuildRequires: cmake(Qt6Core) BuildRequires: cmake(Qt6Gui) @@ -52,7 +52,7 @@ BuildRequires: cmake(Qt6Test) BuildRequires: cmake(Qt6Widgets) BuildRequires: cmake(Qt6Xml) %endif -BuildRequires: boost-devel +BuildRequires: boost-devel >= 1.58.0 Requires: poppler-data @@ -150,6 +150,7 @@ Requires: %{name}-devel = %{version}-%{release} %package utils Summary: Command line utilities for converting PDF files Requires: %{name} = %{version}-%{release} + %description utils Command line tools for manipulating PDF files and converting them to other formats. @@ -157,8 +158,6 @@ other formats. %prep %autosetup -p1 -b 1 -chmod -x poppler/CairoFontEngine.cc - %build %cmake \ -DENABLE_CMS=lcms2 \ @@ -167,36 +166,14 @@ chmod -x poppler/CairoFontEngine.cc -DENABLE_LIBOPENJPEG=openjpeg2 \ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ -DENABLE_ZLIB=OFF \ - .. + -DTESTDATADIR=%{_builddir}/test-master %cmake_build %install %cmake_install %check -%make_build test - -# verify pkg-config sanity/version -export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig -test "$(pkg-config --modversion poppler)" = "%{version}" -test "$(pkg-config --modversion poppler-cpp)" = "%{version}" -test "$(pkg-config --modversion poppler-glib)" = "%{version}" -test "$(pkg-config --modversion poppler-qt5)" = "%{version}" -%if 0%{?qt6} -test "$(pkg-config --modversion poppler-qt6)" = "%{version}" -%endif - -%ldconfig_scriptlets - -%ldconfig_scriptlets glib - -%ldconfig_scriptlets qt5 - -%if 0%{?qt6} -%ldconfig_scriptlets qt6 -%endif - -%ldconfig_scriptlets cpp +%ctest %files %license COPYING @@ -260,6 +237,10 @@ test "$(pkg-config --modversion poppler-qt6)" = "%{version}" %{_mandir}/man1/* %changelog +* Wed Nov 16 2022 Funda Wang - 22.11.0-1 +- update to 22.11.0 +- renew SOURCE1 url as tarball from gitlab.freedesktop.org + * Thu Sep 1 2022 mgb01105731 - 22.08.0-1 - update to 22.08.0 diff --git a/test-master.tar.bz2 b/test-master.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..6862742837cfb82cca1e5352af85ab599fa83434 Binary files /dev/null and b/test-master.tar.bz2 differ