From f3b9ff15dc4e33fbbdd958d78de0064e7155ec53 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 09 2021 09:46:57 +0000
Subject: import evince-3.28.4-14.el8


---

diff --git a/SOURCES/evince-3.28.4-containing-folder.patch b/SOURCES/evince-3.28.4-containing-folder.patch
new file mode 100644
index 0000000..756134f
--- /dev/null
+++ b/SOURCES/evince-3.28.4-containing-folder.patch
@@ -0,0 +1,31 @@
+From 9756fdca2efe71738d02792e839862cb5f0a0244 Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik@redhat.com>
+Date: Tue, 16 Feb 2021 17:15:20 +0100
+Subject: [PATCH] window: Use tmp dir as containing folder for non-native file
+
+Show the temporary directory containing the downloaded document
+as containing folder for documents from remote URIs.
+
+It fails currently since it can not open remote URIs.
+---
+ shell/ev-window.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/shell/ev-window.c b/shell/ev-window.c
+index ba282e18..a1bc55f0 100644
+--- a/shell/ev-window.c
++++ b/shell/ev-window.c
+@@ -3290,6 +3290,10 @@ ev_window_cmd_open_containing_folder (GSimpleAction *action,
+ 	}
+ 
+ 	file = g_file_new_for_uri (window->priv->uri);
++	if (!g_file_is_native (file)) {
++		g_object_unref (file);
++		file = g_file_new_for_uri (ev_document_get_uri (window->priv->document));
++	}
+ 	list.next = list.prev = NULL;
+ 	list.data = file;
+ 
+-- 
+2.30.2
+
diff --git a/SOURCES/evince-3.28.4-reset-form-translations.patch b/SOURCES/evince-3.28.4-reset-form-translations.patch
index c166aa4..e431942 100644
--- a/SOURCES/evince-3.28.4-reset-form-translations.patch
+++ b/SOURCES/evince-3.28.4-reset-form-translations.patch
@@ -1,3 +1,16 @@
+--- evince-3.28.4/po/bg.po
++++ evince-3.28.4/po/bg.po
+@@ -666,6 +666,10 @@ msgstr "Отиване при файла
+ msgid "Launch %s"
+ msgstr "Стартиране на %s"
+ 
++#: libview/ev-view.c:2174
++msgid "Reset form"
++msgstr "Изчистване на формуляра"
++
+ #: ../libview/ev-view-presentation.c:752
+ msgid "Jump to page:"
+ msgstr "Отиване на страница:"
 --- evince-3.28.4/po/ca.po
 +++ evince-3.28.4/po/ca.po
 @@ -667,6 +667,10 @@ msgstr "Vés al fitxer «%s»"
@@ -63,6 +76,19 @@
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Jump to page:"
+--- evince-3.28.4/po/el.po
++++ evince-3.28.4/po/el.po
+@@ -683,6 +683,10 @@ msgstr "Μετάβαση στο αρχε
+ msgid "Launch %s"
+ msgstr "Εκκίνηση %s"
+ 
++#: libview/ev-view.c:2174
++msgid "Reset form"
++msgstr "Επαναφορά φόρμας"
++
+ #: ../libview/ev-view-presentation.c:752
+ msgid "Jump to page:"
+ msgstr "Μετάβαση στη σελίδα:"
 --- evince-3.28.4/po/es.po
 +++ evince-3.28.4/po/es.po
 @@ -677,6 +677,10 @@ msgstr "Ir al archivo «%s»"
@@ -180,6 +206,19 @@
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Ugrás oldalra:"
+--- evince-3.28.4/po/hr.po
++++ evince-3.28.4/po/hr.po
+@@ -664,6 +664,10 @@ msgstr "Idi na datoteku \"%s\""
+ msgid "Launch %s"
+ msgstr "Pokreni %s"
+ 
++#: libview/ev-view.c:2174
++msgid "Reset form"
++msgstr "Poništi obrazac"
++
+ #: ../libview/ev-view-presentation.c:752
+ msgid "Jump to page:"
+ msgstr "Idi na stranicu:"
 --- evince-3.28.4/po/id.po
 +++ evince-3.28.4/po/id.po
 @@ -669,6 +669,10 @@ msgstr "Pergi ke berkas “%s”"
@@ -271,6 +310,45 @@
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Gå til side:"
+--- evince-3.28.4/po/ne.po
++++ evince-3.28.4/po/ne.po
+@@ -635,6 +635,10 @@ msgstr "“%s” फाइलमा ज�
+ msgid "Launch %s"
+ msgstr "%s सुरु गर्नुहोस्"
+ 
++#: libview/ev-view.c:2172
++msgid "Reset form"
++msgstr "फारम पुनः मिलान"
++
+ #: ../libview/ev-view-presentation.c:752
+ msgid "Jump to page:"
+ msgstr "पृष्ठमा जानुहोस्:"
+--- evince-3.28.4/po/nl.po
++++ evince-3.28.4/po/nl.po
+@@ -700,6 +700,10 @@ msgstr "Ga naar bestand ‘%s’"
+ msgid "Launch %s"
+ msgstr "%s opstarten"
+ 
++#: libview/ev-view.c:2174
++msgid "Reset form"
++msgstr "Formulier opnieuw instellen"
++
+ #: ../libview/ev-view-presentation.c:752
+ msgid "Jump to page:"
+ msgstr "Ga naar pagina:"
+--- evince-3.28.4/po/oc.po
++++ evince-3.28.4/po/oc.po
+@@ -695,6 +695,10 @@ msgstr "Anar a la pagina « %s »"
+ msgid "Launch %s"
+ msgstr "Aviar %s"
+ 
++#: libview/ev-view.c:2174
++msgid "Reset form"
++msgstr "Reïnicializar lo formulari"
++
+ #: ../libview/ev-view-presentation.c:735
+ msgid "Jump to page:"
+ msgstr "Anar a la pagina :"
 --- evince-3.28.4/po/pa.po
 +++ evince-3.28.4/po/pa.po
 @@ -674,6 +674,10 @@ msgstr "ਫਾਇਲ “%s” ਉੱਤ�
@@ -336,6 +414,19 @@
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Sari la pagina:"
+--- evince-3.28.4/po/ru.po
++++ evince-3.28.4/po/ru.po
+@@ -670,6 +670,10 @@ msgstr "Перейти к файлу «%
+ msgid "Launch %s"
+ msgstr "Запустить %s"
+ 
++#: libview/ev-view.c:2173
++msgid "Reset form"
++msgstr "Очистить форму"
++
+ #: ../libview/ev-view-presentation.c:752
+ msgid "Jump to page:"
+ msgstr "Перейти к странице:"
 --- evince-3.28.4/po/sk.po
 +++ evince-3.28.4/po/sk.po
 @@ -753,6 +753,10 @@ msgstr "Prejde na súbor „%s“"
@@ -414,6 +505,19 @@
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Перейти до сторінки:"
+--- evince-3.28.4/po/vi.po
++++ evince-3.28.4/po/vi.po
+@@ -663,6 +663,10 @@ msgstr "Tới tập tin “%s”"
+ msgid "Launch %s"
+ msgstr "Khởi chạy %s"
+ 
++#: libview/ev-view.c:2172
++msgid "Reset form"
++msgstr "Đặt lại form"
++
+ #: ../libview/ev-view-presentation.c:752
+ msgid "Jump to page:"
+ msgstr "Nhảy đến trang:"
 --- evince-3.28.4/po/zh_CN.po
 +++ evince-3.28.4/po/zh_CN.po
 @@ -665,6 +665,10 @@ msgstr "转到文件“%s”"
@@ -427,3 +531,16 @@
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "跳到页面："
+--- evince-3.28.4/po/zh_TW.po
++++ evince-3.28.4/po/zh_TW.po
+@@ -655,6 +655,10 @@ msgstr "前往「%s」檔案"
+ msgid "Launch %s"
+ msgstr "執行 %s"
+ 
++#: libview/ev-view.c:2172
++msgid "Reset form"
++msgstr "重設表單"
++
+ #: ../libview/ev-view-presentation.c:752
+ msgid "Jump to page:"
+ msgstr "前往頁面："
diff --git a/SPECS/evince.spec b/SPECS/evince.spec
index 9aa7243..69f4836 100644
--- a/SPECS/evince.spec
+++ b/SPECS/evince.spec
@@ -5,7 +5,7 @@
 
 Name:           evince
 Version:        3.28.4
-Release:        11%{?dist}
+Release:        14%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
@@ -35,8 +35,12 @@ Patch11:        evince-3.28.4-application-id.patch
 Patch12:        evince-3.28.4-reset-form-action.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1896006
+# https://bugzilla.redhat.com/show_bug.cgi?id=2006331
 Patch13:        evince-3.28.4-reset-form-translations.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1917752
+Patch14:        evince-3.28.4-containing-folder.patch
+
 BuildRequires:  pkgconfig(adwaita-icon-theme)
 BuildRequires:  pkgconfig(gio-unix-2.0) >= %{glib2_version}
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
@@ -265,9 +269,22 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/evince.desktop
 %{_libdir}/mozilla/plugins/libevbrowserplugin.so
 
 %changelog
-* Wed Mar 17 2021 Marek Kasik <mkasik@redhat.com> - 3.28.4-11
-- Add remaining translations of string "Reset form"
-- Resolves: #1896006
+* Fri Sep 24 2021 Marek Kasik <mkasik@redhat.com> - 3.28.4-14
+- Bumping release
+- Resolves: #2006331
+
+* Fri Sep 24 2021 Marek Kasik <mkasik@redhat.com> - 3.28.4-13
+- Update translations of string "Reset form"
+- Resolves: #2006331
+
+* Mon Mar 22 2021 Marek Kasik <mkasik@redhat.com> - 3.28.4-12
+- Bumping release
+- Required due to collision of development of 2 y-branches
+- Resolves: #1917752
+
+* Mon Mar 22 2021 Marek Kasik <mkasik@redhat.com> - 3.28.4-11
+- Use tmp dir as containing folder for non-native files
+- Resolves: #1917752
 
 * Mon Feb 15 2021 Marek Kasik <mkasik@redhat.com> - 3.28.4-10
 - Add available translations of string "Reset form"