Decrease required version of poppler to 22.01.0

Change doc path
This commit is contained in:
Marek Kasik 2022-03-15 13:32:07 +01:00
parent e79bbdaae6
commit 79802ab45f
2 changed files with 22 additions and 6 deletions

View File

@ -0,0 +1,11 @@
--- evince-42.rc/meson.build
+++ evince-42.rc/meson.build
@@ -399,7 +399,7 @@ elif get_option('dvi').auto()
endif
# *** PDF ***
-poppler_req_version = '>= 22.02.0'
+poppler_req_version = '>= 22.01.0'
poppler_glib_dep = dependency('poppler-glib', version: poppler_req_version, required: get_option('pdf'))
libxml_req_version = '>= 2.5.0'

View File

@ -3,19 +3,21 @@
%global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/evince/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -)) %global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/evince/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
%global libarchive_version 3.6.0 %global libarchive_version 3.6.0
%global poppler_version 22.02.0 %global poppler_version 22.01.0
%global tarball_version %%(echo %{version} | tr '~' '.') %global tarball_version %%(echo %{version} | tr '~' '.')
Name: evince Name: evince
Version: 42~rc Version: 42~rc
Release: 1%{?dist} Release: 2%{?dist}
Summary: Document viewer Summary: Document viewer
License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
URL: https://wiki.gnome.org/Apps/Evince URL: https://wiki.gnome.org/Apps/Evince
Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz
Patch0: evince-42-poppler-requirement-decrease.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: pkgconfig(adwaita-icon-theme) BuildRequires: pkgconfig(adwaita-icon-theme)
@ -153,7 +155,6 @@ It provides the printing preview for the GTK printing dialog.
-Ddjvu=disabled \ -Ddjvu=disabled \
%endif %endif
-Dxps=enabled \ -Dxps=enabled \
-Dt1lib=disabled \
%if 0%{?flatpak} %if 0%{?flatpak}
-Dsystemduserunitdir=no \ -Dsystemduserunitdir=no \
-Dnautilus=false \ -Dnautilus=false \
@ -226,9 +227,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
%{_libdir}/girepository-1.0/EvinceView-3.0.typelib %{_libdir}/girepository-1.0/EvinceView-3.0.typelib
%files devel %files devel
%{_datadir}/gtk-doc/html/evince/ %{_datadir}/doc/evince-libs
%{_datadir}/gtk-doc/html/libevview-3.0 %{_datadir}/doc/libevview
%{_datadir}/gtk-doc/html/libevdocument-3.0 %{_datadir}/doc/libevdocument
%dir %{_includedir}/evince %dir %{_includedir}/evince
%{_includedir}/evince/3.0 %{_includedir}/evince/3.0
%{_libdir}/libevview3.so %{_libdir}/libevview3.so
@ -267,6 +268,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
%{_mandir}/man1/evince-previewer.1* %{_mandir}/man1/evince-previewer.1*
%changelog %changelog
* Tue Mar 15 2022 Marek Kasik <mkasik@redhat.com> - 42~rc-2
- Decrease required version of poppler to 22.01.0
- Change doc path
* Mon Mar 07 2022 David King <amigadave@amigadave.com> - 42~rc-1 * Mon Mar 07 2022 David King <amigadave@amigadave.com> - 42~rc-1
- Update to 42.rc - Update to 42.rc