Rebuild against gspell

Also, convert all conditionals to bconds, except for comics which is no
longer needed given the upcoming end of support for RHEL 7.

.gitignore

@@ -94,3 +94,31 @@ evince-3.0.0.tar.bz2
 /evince-3.37.3.tar.xz
 /evince-3.37.90.tar.xz
 /evince-3.38.0.tar.xz
+/evince-3.39.1.tar.xz
+/evince-3.39.2.tar.xz
+/evince-40.0.tar.xz
+/evince-40.1.tar.xz
+/evince-40.2.tar.xz
+/evince-41.alpha.tar.xz
+/evince-41.2.tar.xz
+/evince-41.3.tar.xz
+/evince-42.rc.tar.xz
+/evince-42.1.tar.xz
+/evince-42.2.tar.xz
+/evince-42.3.tar.xz
+/evince-43.alpha.tar.xz
+/evince-43.0.tar.xz
+/evince-43.1.tar.xz
+/evince-44.rc.tar.xz
+/evince-44.0.tar.xz
+/evince-44.1.tar.xz
+/evince-44.2.tar.xz
+/evince-44.3.tar.xz
+/evince-45.alpha.tar.xz
+/evince-45.rc.tar.xz
+/evince-45.0.tar.xz
+/evince-46.rc.tar.xz
+/evince-46.0.tar.xz
+/evince-46.1.tar.xz
+/evince-46.3.tar.xz
+/evince-46.3.1.tar.xz

evince.spec

@@ -1,61 +1,77 @@
-%global poppler_version 0.33.0
-%global glib2_version 2.36.0
-%global gtk3_version 3.22.0
-%global gxps_version 0.2.1
-%global synctex_version 1.19
+# texlive is buildroot only for Fedora flatpaks
+%bcond dvi %{undefined flatpak}
+# djvulibre, gspell are not available in RHEL 10+
+%bcond djvu %{undefined rhel}
+%bcond gspell %{undefined rhel}
+# not compatible with libnautilus-extension-4
+%bcond nautilus 0
+
+# Exclude private libraries from autogenerated provides and requires
+%global __provides_exclude_from ^%{_libdir}/evince/
+%global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/evince/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
+
+%global libarchive_version 3.6.0
+%global poppler_version 22.05.0
+
+%global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           evince
-Version:        3.38.0
-Release:        1%{?dist}
+Version:        46.3.1
+Release:        2%{?dist}
 Summary:        Document viewer
 
-License:        GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
+License:        GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND X11 AND MIT AND Afmparse
 URL:            https://wiki.gnome.org/Apps/Evince
-Source0:        https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz
 
-BuildRequires:  gcc-c++
 BuildRequires:  gcc
 BuildRequires:  gettext-devel
 BuildRequires:  pkgconfig(adwaita-icon-theme)
-BuildRequires:  pkgconfig(gio-unix-2.0) >= %{glib2_version}
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
+%if %{with gspell}
+BuildRequires:  pkgconfig(gspell-1)
+%endif
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-base-1.0)
 BuildRequires:  pkgconfig(gstreamer-video-1.0)
-BuildRequires:  pkgconfig(gtk+-x11-3.0) >= %{gtk3_version}
+BuildRequires:  pkgconfig(gtk+-x11-3.0)
+BuildRequires:  pkgconfig(libarchive) >= %{libarchive_version}
+BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(libspectre)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(poppler-glib) >= %{poppler_version}
-BuildRequires:  pkgconfig(libarchive)
-BuildRequires:  pkgconfig(gspell-1)
 BuildRequires:  libtiff-devel
-BuildRequires:  gtk-doc
+BuildRequires:  gi-docgen
 BuildRequires:  yelp-tools
 BuildRequires:  /usr/bin/desktop-file-validate
 BuildRequires:  libappstream-glib-devel
 BuildRequires:  meson
-%if ! 0%{?flatpak}
-BuildRequires:  pkgconfig(synctex) >= %{synctex_version}
-# for the nautilus properties page
-BuildRequires:  pkgconfig(libnautilus-extension)
+BuildRequires:  systemd-rpm-macros
+%if %{with dvi}
+BuildRequires:  pkgconfig(synctex)
 # for the dvi backend
 BuildRequires:  texlive-lib-devel
 %endif
-%if 0%{?fedora}
+%if %{with djvu}
 # for the djvu backend
 BuildRequires:  djvulibre-devel
 %endif
+%if %{with nautilus}
+# for the nautilus properties page
+BuildRequires:  pkgconfig(libnautilus-extension)
+%endif
 # for the xps backend
-BuildRequires:  pkgconfig(libgxps) >= %{gxps_version}
+BuildRequires:  pkgconfig(libgxps)
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: glib2%{?_isa} >= %{glib2_version}
-Requires: gtk3%{?_isa} >= %{gtk3_version}
+Requires: %{name}-previewer%{?_isa} = %{version}-%{release}
+Requires: %{name}-thumbnailer%{?_isa} = %{version}-%{release}
 
-# Removed in F29
-Obsoletes: evince-browser-plugin < 3.30.0
+Obsoletes: %{name}-nautilus < 43~alpha-2
 
 %description
 Evince is simple multi-page document viewer. It can display and print
@@ -70,9 +86,11 @@ installing additional backends.
 
 %package libs
 Summary: Libraries for the evince document viewer
-%if 0%{?fedora}
+%if %{with djvu}
 Recommends: %{name}-djvu%{?_isa} = %{version}-%{release}
 %endif
+Requires:   libarchive%{?_isa} >= %{libarchive_version}
+Requires:   poppler-glib%{?_isa} >= %{poppler_version}
 
 %description libs
 This package contains shared libraries needed for evince
@@ -81,6 +99,10 @@ This package contains shared libraries needed for evince
 %package devel
 Summary: Support for developing backends for the evince document viewer
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+# Because web fonts from upstream are not bundled in the gi-docgen package,
+# packages containing documentation generated with gi-docgen should depend on
+# this metapackage to ensure the proper system fonts are present.
+Recommends: gi-docgen-fonts
 
 %description devel
 This package contains libraries and header files needed for evince
@@ -96,7 +118,7 @@ Requires: texlive-collection-fontsrecommended
 This package contains a backend to let evince display dvi files.
 
 
-%if 0%{?fedora}
+%if %{with djvu}
 %package djvu
 Summary: Evince backend for djvu files
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -105,10 +127,10 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 This package contains a backend to let evince display djvu files.
 %endif
 
-%if ! 0%{?flatpak}
+%if %{with nautilus}
 %package nautilus
 Summary: Evince extension for nautilus
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: nautilus%{?_isa}
 
 %description nautilus
@@ -116,30 +138,47 @@ This package contains the evince extension for the nautilus file manager.
 It adds an additional tab called "Document" to the file properties dialog.
 %endif
 
+%package thumbnailer
+Summary: Evince thumbnailer
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description thumbnailer
+This package brings the Evince thumbnailer independently from Evince.
+
+%package previewer
+Summary: Evince previewer
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description previewer
+This package brings the Evince previewer independently from Evince.
+It provides the printing preview for the GTK printing dialog.
+
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
 %meson \
-%if 0%{?fedora} || 0%{?rhel} > 7
         -Dcomics=enabled \
-%endif
-%if 0%{?flatpak}
-        -Ddvi=disabled \
-%else
+%if %{with dvi}
         -Ddvi=enabled \
+%else
+        -Ddvi=disabled \
 %endif
-%if 0%{?fedora}
+%if %{with djvu}
         -Ddjvu=enabled \
 %else
         -Ddjvu=disabled \
+%endif
+%if %{with gspell}
+        -Dgspell=enabled \
+%else
+        -Dgspell=disabled \
 %endif
         -Dxps=enabled \
-        -Dt1lib=disabled \
 %if 0%{?flatpak}
         -Dsystemduserunitdir=no \
-        -Dnautilus=false \
 %endif
+        -Dnautilus=false \
         -Dps=enabled
 %meson_build
 
@@ -148,29 +187,32 @@ It adds an additional tab called "Document" to the file properties dialog.
 
 %find_lang evince --with-gnome
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/applications
+rm -f %{buildroot}%{_metainfodir}/evince-pdfdocument.metainfo.xml
+rm -f %{buildroot}%{_metainfodir}/evince-psdocument.metainfo.xml
+rm -f %{buildroot}%{_metainfodir}/evince-tiffdocument.metainfo.xml
+rm -f %{buildroot}%{_metainfodir}/evince-comicsdocument.metainfo.xml
+rm -f %{buildroot}%{_metainfodir}/evince-xpsdocument.metainfo.xml
 
 %check
-appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Evince.appdata.xml
+appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Evince.metainfo.xml
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-previewer.desktop
 
-%ldconfig_scriptlets libs
-
 %files -f evince.lang
-%{_bindir}/*
-%{_datadir}/%{name}/
+%{_bindir}/evince
+%{_bindir}/evince-previewer
 %{_datadir}/applications/org.gnome.Evince.desktop
 %{_datadir}/applications/org.gnome.Evince-previewer.desktop
+%{_datadir}/evince/
 %{_datadir}/icons/hicolor/*/apps/org.gnome.Evince.*
 %{_datadir}/icons/hicolor/*/apps/org.gnome.Evince-symbolic.svg
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/evince.1*
+%{_mandir}/man1/evince-previewer.1*
 %{_libexecdir}/evinced
 %{_datadir}/dbus-1/services/org.gnome.evince.Daemon.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Evince.gschema.xml
-%{_datadir}/GConf/gsettings/evince.convert
-%{_datadir}/metainfo/org.gnome.Evince.appdata.xml
-%{_datadir}/thumbnailers/evince.thumbnailer
+%{_metainfodir}/org.gnome.Evince.metainfo.xml
 %if ! 0%{?flatpak}
 %{_userunitdir}/org.gnome.Evince.service
 %endif
@@ -178,40 +220,33 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
 %files libs
 %doc NEWS AUTHORS
 %license COPYING
-%{_libdir}/libevview3.so.*
-%{_libdir}/libevdocument3.so.*
+%{_libdir}/libevdocument3.so.4*
+%{_libdir}/libevview3.so.3*
 %dir %{_libdir}/evince
 %dir %{_libdir}/evince/4
 %dir %{_libdir}/evince/4/backends
 %{_libdir}/evince/4/backends/libpdfdocument.so
 %{_libdir}/evince/4/backends/pdfdocument.evince-backend
-%{_datadir}/metainfo/evince-pdfdocument.metainfo.xml
 
 %{_libdir}/evince/4/backends/libpsdocument.so
 %{_libdir}/evince/4/backends/psdocument.evince-backend
-%{_datadir}/metainfo/evince-psdocument.metainfo.xml
 
 %{_libdir}/evince/4/backends/libtiffdocument.so
 %{_libdir}/evince/4/backends/tiffdocument.evince-backend
-%{_datadir}/metainfo/evince-tiffdocument.metainfo.xml
 
-%if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/evince/4/backends/libcomicsdocument.so
 %{_libdir}/evince/4/backends/comicsdocument.evince-backend
-%{_datadir}/metainfo/evince-comicsdocument.metainfo.xml
-%endif
 
 %{_libdir}/evince/4/backends/libxpsdocument.so
 %{_libdir}/evince/4/backends/xpsdocument.evince-backend
-%{_datadir}/metainfo/evince-xpsdocument.metainfo.xml
 
 %{_libdir}/girepository-1.0/EvinceDocument-3.0.typelib
 %{_libdir}/girepository-1.0/EvinceView-3.0.typelib
 
 %files devel
-%{_datadir}/gtk-doc/html/evince/
-%{_datadir}/gtk-doc/html/libevview-3.0
-%{_datadir}/gtk-doc/html/libevdocument-3.0
+%{_datadir}/doc/evince-libs
+%{_datadir}/doc/libevview
+%{_datadir}/doc/libevdocument
 %dir %{_includedir}/evince
 %{_includedir}/evince/3.0
 %{_libdir}/libevview3.so
@@ -221,26 +256,200 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
 %{_datadir}/gir-1.0/EvinceDocument-3.0.gir
 %{_datadir}/gir-1.0/EvinceView-3.0.gir
 
-%if ! 0%{?flatpak}
+%if %{with dvi}
 %files dvi
 %{_libdir}/evince/4/backends/libdvidocument.so*
 %{_libdir}/evince/4/backends/dvidocument.evince-backend
 %{_datadir}/metainfo/evince-dvidocument.metainfo.xml
 %endif
 
-%if 0%{?fedora}
+%if %{with djvu}
 %files djvu
 %{_libdir}/evince/4/backends/libdjvudocument.so
 %{_libdir}/evince/4/backends/djvudocument.evince-backend
 %{_datadir}/metainfo/evince-djvudocument.metainfo.xml
 %endif
 
-%if ! 0%{?flatpak}
+%if %{with nautilus}
 %files nautilus
 %{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so
 %endif
 
+%files thumbnailer
+%{_bindir}/evince-thumbnailer
+%{_datadir}/thumbnailers/evince.thumbnailer
+%{_mandir}/man1/evince-thumbnailer.1*
+
+%files previewer
+%{_bindir}/evince-previewer
+%{_mandir}/man1/evince-previewer.1*
+
 %changelog
+* Mon Aug 26 2024 David King <amigadave@amigadave.com> - 46.3.1-2
+- Rebuild against gspell
+
+* Wed Jul 24 2024 David King <amigadave@amigadave.com> - 46.3.1-1
+- Update to 46.3.1
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 46.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue May 28 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 46.3-2
+- Disable gspell on RHEL
+
+* Tue May 28 2024 David King <amigadave@amigadave.com> - 46.3-1
+- Update to 46.3
+
+* Mon Apr 29 2024 David King <amigadave@amigadave.com> - 46.1-1
+- Update to 46.1
+
+* Mon Mar 18 2024 David King <amigadave@amigadave.com> - 46.0-1
+- Update to 46.0
+
+* Mon Mar 11 2024 David King <amigadave@amigadave.com> - 46~rc-1
+- Update to 46.rc
+
+* Tue Feb  6 2024 Marek Kasik <mkasik@redhat.com> - 45.0-4
+- Migrated to SPDX license
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Sep 20 2023 Kalev Lember <klember@redhat.com> - 45.0-1
+- Update to 45.0
+
+* Tue Sep 05 2023 Kalev Lember <klember@redhat.com> - 45~rc-1
+- Update to 45.rc
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 45~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jul 03 2023 Kalev Lember <klember@redhat.com> - 45~alpha-1
+- Update to 45.alpha
+
+* Sat Jul 01 2023 Kalev Lember <klember@redhat.com> - 44.3-1
+- Update to 44.3
+
+* Sat Jun 17 2023 Kalev Lember <klember@redhat.com> - 44.2-1
+- Update to 44.2
+
+* Wed Mar 22 2023 David King <amigadave@amigadave.com> - 44.1-1
+- Update to 44.1
+
+* Sat Mar 18 2023 David King <amigadave@amigadave.com> - 44.0-1
+- Update to 44.0
+
+* Tue Mar 14 2023 Marek Kasik <mkasik@redhat.com> - 44~rc-2
+- Fix crashes on closing of Evince
+- Resolves: #2178016
+
+* Wed Mar 08 2023 David King <amigadave@amigadave.com> - 44~rc-1
+- Update to 44.rc
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 43.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Dec 08 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 43.1-2
+- Ensure correct fonts are installed for HTML docs
+
+* Thu Oct 27 2022 David King <amigadave@amigadave.com> - 43.1-1
+- Update to 43.1
+
+* Tue Sep 20 2022 Kalev Lember <klember@redhat.com> - 43.0-1
+- Update to 43.0
+- Add missing BR on systemd-rpm-macros
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 43~alpha-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jul 18 2022 Kalev Lember <klember@redhat.com> - 43~alpha-3
+- Obsolete nautilus subpackage
+
+* Mon Jul 18 2022 Kalev Lember <klember@redhat.com> - 43~alpha-2
+- Disable nautilus extension as it's not ported to gtk4-based nautilus
+
+* Mon Jul 18 2022 Kalev Lember <klember@redhat.com> - 43~alpha-1
+- Update to 43.alpha
+
+* Mon May 23 2022 David King <amigadave@amigadave.com> - 42.3-1
+- Update to 42.3
+
+* Wed May 18 2022 David King <amigadave@amigadave.com> - 42.2-2
+- Require libs subpackage for nautilus extension (#2086848)
+
+* Sun Apr 17 2022 David King <amigadave@amigadave.com> - 42.2-1
+- Update to 42.2
+
+* Sat Mar 19 2022 David King <amigadave@amigadave.com> - 42.1-1
+- Update to 42.1
+
+* 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
+- Update to 42.rc
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 41.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Dec 07 2021 Kalev Lember <klember@redhat.com> - 41.3-1
+- Update to 41.3
+
+* Wed Oct 27 2021 Kalev Lember <klember@redhat.com> - 41.2-1
+- Update to 41.2
+
+* Fri Sep 17 2021 Marek Kasik <mkasik@redhat.com> - 41~alpha-2
+- Remove metainfo for plugins since they are not real addons
+- Resolves: #2005386
+
+* Tue Aug 03 2021 Kalev Lember <klember@redhat.com> - 41~alpha-1
+- Update to 41.alpha
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 40.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 21 2021 Kalev Lember <klember@redhat.com> - 40.2-1
+- Update to 40.2
+
+* Tue May 04 2021 Felipe Borges <feborges@redhat.com> - 40.1-2
+- Split evince-previewer into its own package
+- See https://github.com/fedora-silverblue/issue-tracker/issues/122
+
+* Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 40.1-1
+- Update to 40.1
+- Remove various minimum version requires
+- Remove old obsoletes
+- Don't use ldconfig_scriptlets
+- Filter private library provides
+
+* Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 40.0-1
+- Update to 40.0
+- Tighten soname globs
+
+* Wed Mar 03 2021 Marek Kasik <mkasik@redhat.com> - 3.39.2-2
+- Set page cache size with correct type
+- Resolves: #1458845
+
+* Wed Feb 17 2021 Kalev Lember <klember@redhat.com> - 3.39.2-1
+- Update to 3.39.2
+
+* Mon Feb 08 2021 Felipe Borges <feborges@redhat.com> - 3.39.1-3
+- Add evince-thumbnailer.1.gz to the evince-thumbnailer subpackage
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.39.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jan 25 2021 Kalev Lember <klember@redhat.com> - 3.39.1-1
+- Update to 3.39.1
+
+* Tue Nov 10 2020 Felipe Borges <feborges@redhat.com> - 3.38.0-2
+- Split evince-thumbnailer into its own package
+- See https://github.com/fedora-silverblue/issue-tracker/issues/98
+
 * Sat Sep 12 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
 - Update to 3.38.0
 

sources

@@ -1 +1 @@
-SHA512 (evince-3.38.0.tar.xz) = 2d532388b933891c15ecc598b167c087647c507db5c6081abefab062007f14f5bb2cbdf80cecee3620600922fbbe6e3090cbc44663193b2a79c2caeeacb54fb9
+SHA512 (evince-46.3.1.tar.xz) = 3614169e9bb2a9b9331c52d9acb1e6320e675be448a5cbad654240bea1f7bb26d10af060c4b0a820e68126edc338484e95cbf2682de59da6fddbd328b267a76f