diff --git a/.evince.metadata b/.evince.metadata index 5e8cb9d..4f27475 100644 --- a/.evince.metadata +++ b/.evince.metadata @@ -1 +1 @@ -979b3b78a0035e0fe9b7d8136956680d03f12551 SOURCES/evince-40.4.tar.xz +67c0f99cdb64f0b919e5f50604ab1824caf3d4ca SOURCES/evince-40.5.tar.xz diff --git a/.gitignore b/.gitignore index a28d419..99565c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/evince-40.4.tar.xz +SOURCES/evince-40.5.tar.xz diff --git a/SOURCES/evince-40.4-annotation-actions.patch b/SOURCES/evince-40.4-annotation-actions.patch deleted file mode 100644 index a4bba00..0000000 --- a/SOURCES/evince-40.4-annotation-actions.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 31ad19f0812212412b01cc933c9c1806245735ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= -Date: Thu, 22 Jul 2021 13:47:23 -0400 -Subject: [PATCH] shell: Enable annotation actions only in document that - supports them - -Fixes #1638 ---- - shell/ev-window.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/shell/ev-window.c b/shell/ev-window.c -index fab121ca..0043074a 100644 ---- a/shell/ev-window.c -+++ b/shell/ev-window.c -@@ -532,6 +532,10 @@ ev_window_update_actions_sensitivity (EvWindow *ev_window) - !recent_view_mode); - ev_window_set_action_enabled (ev_window, "toggle-find", can_find && - !recent_view_mode); -+ ev_window_set_action_enabled (ev_window, "add-annotation", can_annotate && -+ !recent_view_mode); -+ ev_window_set_action_enabled (ev_window, "highlight-annotation", can_annotate && -+ !recent_view_mode); - ev_window_set_action_enabled (ev_window, "toggle-edit-annots", can_annotate && - !recent_view_mode); - ev_window_set_action_enabled (ev_window, "rotate-left", has_pages && --- -2.34.1 - diff --git a/SPECS/evince.spec b/SPECS/evince.spec index 5870e4e..7920d01 100644 --- a/SPECS/evince.spec +++ b/SPECS/evince.spec @@ -3,8 +3,8 @@ %global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/evince/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -)) Name: evince -Version: 40.4 -Release: 4%{?dist} +Version: 40.5 +Release: 2%{?dist} Summary: Document viewer License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse @@ -17,9 +17,6 @@ Patch1: evince-40.1-covscan.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2006768 Patch2: evince-40.4-quit-shortcut.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=2041333 -Patch3: evince-40.4-annotation-actions.patch - BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: gettext-devel @@ -116,7 +113,7 @@ This package contains a backend to let evince display djvu files. %if ! 0%{?flatpak} %package nautilus Summary: Evince extension for nautilus -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: nautilus%{?_isa} %description nautilus @@ -272,6 +269,15 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p %{_mandir}/man1/evince-previewer.1* %changelog +* Tue May 24 2022 Marek Kasik - 40.5-2 +- Fix requirements of evince-nautilus +- Required by CI +- Related: #2066166 + +* Mon May 23 2022 Marek Kasik - 40.5-1 +- Rebase to 40.5 +- Resolves: #2066166 + * Wed Jan 19 2022 Marek Kasik - 40.4-4 - Allow annotation actions for PDFs only - Resolves: #2041333