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

@@ -114,3 +114,11 @@ evince-3.0.0.tar.bz2
 /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,20 +1,28 @@
+# 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.02.0
+%global poppler_version 22.05.0
 
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           evince
-Version:        44.3
-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}/44/%{name}-%{tarball_version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz
 
 BuildRequires:  gcc
 BuildRequires:  gettext-devel
@@ -23,7 +31,9 @@ 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)
@@ -41,19 +51,19 @@ BuildRequires:  /usr/bin/desktop-file-validate
 BuildRequires:  libappstream-glib-devel
 BuildRequires:  meson
 BuildRequires:  systemd-rpm-macros
-%if ! 0%{?flatpak}
+%if %{with dvi}
 BuildRequires:  pkgconfig(synctex)
-%if 0
-# for the nautilus properties page
-BuildRequires:  pkgconfig(libnautilus-extension)
-%endif
 # 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)
 
@@ -76,7 +86,7 @@ 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}
@@ -108,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}
@@ -117,8 +127,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 This package contains a backend to let evince display djvu files.
 %endif
 
-%if ! 0%{?flatpak}
-%if 0
+%if %{with nautilus}
 %package nautilus
 Summary: Evince extension for nautilus
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -128,7 +137,6 @@ Requires: nautilus%{?_isa}
 This package contains the evince extension for the nautilus file manager.
 It adds an additional tab called "Document" to the file properties dialog.
 %endif
-%endif
 
 %package thumbnailer
 Summary: Evince thumbnailer
@@ -150,18 +158,21 @@ It provides the printing preview for the GTK printing dialog.
 
 %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 \
 %if 0%{?flatpak}
@@ -184,7 +195,7 @@ 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
 
@@ -201,8 +212,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
 %{_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
-%{_metainfodir}/org.gnome.Evince.appdata.xml
+%{_metainfodir}/org.gnome.Evince.metainfo.xml
 %if ! 0%{?flatpak}
 %{_userunitdir}/org.gnome.Evince.service
 %endif
@@ -224,10 +234,8 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
 %{_libdir}/evince/4/backends/libtiffdocument.so
 %{_libdir}/evince/4/backends/tiffdocument.evince-backend
 
-%if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/evince/4/backends/libcomicsdocument.so
 %{_libdir}/evince/4/backends/comicsdocument.evince-backend
-%endif
 
 %{_libdir}/evince/4/backends/libxpsdocument.so
 %{_libdir}/evince/4/backends/xpsdocument.evince-backend
@@ -248,26 +256,24 @@ 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 0
+%if %{with nautilus}
 %files nautilus
 %{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so
 %endif
-%endif
 
 %files thumbnailer
 %{_bindir}/evince-thumbnailer
@@ -279,6 +285,51 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
 %{_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
 

sources

@@ -1 +1 @@
-SHA512 (evince-44.3.tar.xz) = 7812e588fcce8bfd30c187cffeb02295def043bd51db4eb6d5d226a01eba6e45a07382fb6b7779a485acd922e2f4c3b0fffc63f40d2a8c2f4e6c5052e3761ff1
+SHA512 (evince-46.3.1.tar.xz) = 3614169e9bb2a9b9331c52d9acb1e6320e675be448a5cbad654240bea1f7bb26d10af060c4b0a820e68126edc338484e95cbf2682de59da6fddbd328b267a76f