From e606afc282eb681a34ee1f9d20a883b318a91994 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 24 2021 04:14:23 +0000
Subject: import evince-3.28.4-12.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..a76f9dd 100644
--- a/SOURCES/evince-3.28.4-reset-form-translations.patch
+++ b/SOURCES/evince-3.28.4-reset-form-translations.patch
@@ -4,7 +4,7 @@
  msgid "Launch %s"
  msgstr "Engega %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Reinicialitza el formulari"
 +
@@ -17,124 +17,59 @@
  msgid "Launch %s"
  msgstr "Spustit %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Čistý formulář"
 +
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Přejít na stránku:"
---- evince-3.28.4/po/da.po
-+++ evince-3.28.4/po/da.po
-@@ -682,6 +682,10 @@ msgstr "Gå til filen “%s”"
- msgid "Launch %s"
- msgstr "Start %s"
- 
-+#: ../libview/ev-view.c:2172
-+msgid "Reset form"
-+msgstr "Nulstil formular"
-+
- #: ../libview/ev-view-presentation.c:752
- msgid "Jump to page:"
- msgstr "Gå til side:"
 --- evince-3.28.4/po/de.po
 +++ evince-3.28.4/po/de.po
 @@ -691,6 +691,10 @@ msgstr "Zu Datei »%s« gehen"
  msgid "Launch %s"
  msgstr "%s starten"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Formular zurücksetzen"
 +
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Zu folgender Seite gehen:"
---- evince-3.28.4/po/en_GB.po
-+++ evince-3.28.4/po/en_GB.po
-@@ -684,6 +684,10 @@ msgstr "Go to file “%s”"
- msgid "Launch %s"
- msgstr "Launch %s"
- 
-+#: ../libview/ev-view.c:2172
-+msgid "Reset form"
-+msgstr "Reset form"
-+
- #: ../libview/ev-view-presentation.c:752
- msgid "Jump to page:"
- msgstr "Jump to page:"
 --- evince-3.28.4/po/es.po
 +++ evince-3.28.4/po/es.po
 @@ -677,6 +677,10 @@ msgstr "Ir al archivo «%s»"
  msgid "Launch %s"
  msgstr "Lanzar %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Reiniciar formulario"
 +
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Saltar a la página:"
---- evince-3.28.4/po/eu.po
-+++ evince-3.28.4/po/eu.po
-@@ -665,6 +665,10 @@ msgstr "Joan hona: %s ('%s' fitxategian)
- msgid "Go to file “%s”"
- msgstr "Joan '%s' fitxategira"
- 
-+#: ../libview/ev-view.c:2172
-+msgid "Reset form"
-+msgstr "Leheneratu inprimakia"
-+
- #: ../libview/ev-view.c:2088
- #, c-format
- msgid "Launch %s"
---- evince-3.28.4/po/fa.po
-+++ evince-3.28.4/po/fa.po
-@@ -660,6 +660,10 @@ msgstr "رفتن به پرونده‌ی
- 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/fi.po
 +++ evince-3.28.4/po/fi.po
 @@ -676,6 +676,10 @@ msgstr "Siirry tiedostoon ”%s”"
  msgid "Launch %s"
  msgstr "Käynnistä %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Tyhjennä lomake"
 +
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Siirry sivulle:"
---- evince-3.28.4/po/fr.po
-+++ evince-3.28.4/po/fr.po
-@@ -686,6 +686,10 @@ msgstr "Aller à la page « %s »"
- msgid "Launch %s"
- msgstr "Lancer %s"
- 
-+#: ../libview/ev-view.c:2172
-+msgid "Reset form"
-+msgstr "Réinitialiser le formulaire"
-+
- #: ../libview/ev-view-presentation.c:752
- msgid "Jump to page:"
- msgstr "Aller à la page :"
 --- evince-3.28.4/po/fur.po
 +++ evince-3.28.4/po/fur.po
 @@ -669,6 +669,10 @@ msgstr "Va al file \"%s\""
  msgid "Launch %s"
  msgstr "Fâs partî %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Ripristine modul"
 +
@@ -147,7 +82,7 @@
  msgid "Launch %s"
  msgstr "Iniciar %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Restabelecer o formulario"
 +
@@ -160,7 +95,7 @@
  msgid "Launch %s"
  msgstr "שיגור %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "איפוס טופס"
 +
@@ -173,7 +108,7 @@
  msgid "Launch %s"
  msgstr "%s indítása"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Űrlap visszaállítása"
 +
@@ -186,202 +121,98 @@
  msgid "Launch %s"
  msgstr "Luncurkan %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Reset formulir"
 +
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Lompat ke halaman:"
---- evince-3.28.4/po/it.po
-+++ evince-3.28.4/po/it.po
-@@ -678,6 +678,10 @@ msgstr "Va al file «%s»"
- msgid "Launch %s"
- msgstr "Lancia %s"
- 
-+#: ../libview/ev-view.c:2172
-+msgid "Reset form"
-+msgstr "Azzera modulo"
-+
- #: ../libview/ev-view-presentation.c:752
- msgid "Jump to page:"
- msgstr "Salta alla pagina:"
 --- evince-3.28.4/po/ja.po
 +++ evince-3.28.4/po/ja.po
 @@ -689,6 +689,10 @@ msgstr "ファイル“%s”へ移動し
  msgid "Launch %s"
  msgstr "%s の起動"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "フォームをリセット"
 +
  #: ../libview/ev-view-presentation.c:735
  msgid "Jump to page:"
  msgstr "移動先のページ:"
---- evince-3.28.4/po/kk.po
-+++ evince-3.28.4/po/kk.po
-@@ -664,6 +664,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/ko.po
 +++ evince-3.28.4/po/ko.po
 @@ -665,6 +665,10 @@ msgstr "“%s” 파일로 이동"
  msgid "Launch %s"
  msgstr "%s 실행"
  
-+#: ../libview/ev-view.c:2172
++#: 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/lt.po
-+++ evince-3.28.4/po/lt.po
-@@ -673,6 +673,10 @@ msgstr "Eiti į failą „%s“"
- msgid "Launch %s"
- msgstr "Paleisti %s"
- 
-+#: ../libview/ev-view.c:2172
-+msgid "Reset form"
-+msgstr "Atstatyti formą"
-+
- #: ../libview/ev-view-presentation.c:752
- msgid "Jump to page:"
- msgstr "Eiti į puslapį:"
---- evince-3.28.4/po/nb.po
-+++ evince-3.28.4/po/nb.po
-@@ -662,6 +662,10 @@ msgstr "Gå til fil «%s»"
- msgid "Launch %s"
- msgstr "Start %s"
- 
-+#: ../libview/ev-view.c:2172
-+msgid "Reset form"
-+msgstr "Nullstill skjema"
-+
- #: ../libview/ev-view-presentation.c:752
- msgid "Jump to page:"
- msgstr "Gå til side:"
 --- evince-3.28.4/po/pa.po
 +++ evince-3.28.4/po/pa.po
 @@ -674,6 +674,10 @@ msgstr "ਫਾਇਲ “%s” ਉੱਤ�
  msgid "Launch %s"
  msgstr "%s ਚਲਾਓ"
  
-+#: ../libview/ev-view.c:2172
++#: 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/pl.po
-+++ evince-3.28.4/po/pl.po
-@@ -671,6 +671,10 @@ msgstr "Przejdź do pliku „%s”"
- msgid "Launch %s"
- msgstr "Uruchom „%s”"
- 
-+#: ../libview/ev-view.c:2172
-+msgid "Reset form"
-+msgstr "Przywróć formularz"
-+
- #: ../libview/ev-view-presentation.c:752
- msgid "Jump to page:"
- msgstr "Przejdź do strony:"
 --- evince-3.28.4/po/pt.po
 +++ evince-3.28.4/po/pt.po
 @@ -694,6 +694,10 @@ msgstr "Ir para o ficheiro “%s”"
  msgid "Launch %s"
  msgstr "Iniciar %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Restabelecer a partir de"
 +
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Ir para a página:"
---- evince-3.28.4/po/pt_BR.po
-+++ evince-3.28.4/po/pt_BR.po
-@@ -687,6 +687,10 @@ msgstr "Vai para o arquivo “%s”"
- msgid "Launch %s"
- msgstr "Inicia %s"
- 
-+#: ../libview/ev-view.c:2172
-+msgid "Reset form"
-+msgstr "Redefinir formulário"
-+
- #: ../libview/ev-view-presentation.c:752
- msgid "Jump to page:"
- msgstr "Pular para a página:"
 --- evince-3.28.4/po/ro.po
 +++ evince-3.28.4/po/ro.po
 @@ -674,6 +674,10 @@ msgstr "Navighează la fișierul „%s�
  msgid "Launch %s"
  msgstr "Pornește %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Restabilește formularul"
 +
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Sari la pagina:"
---- evince-3.28.4/po/sk.po
-+++ evince-3.28.4/po/sk.po
-@@ -753,6 +753,10 @@ msgstr "Prejde na súbor „%s“"
- msgid "Launch %s"
- msgstr "Spustí %s"
- 
-+#: ../libview/ev-view.c:2172
-+msgid "Reset form"
-+msgstr "Vynuluje formulár"
-+
- # label
- #: ../libview/ev-view-presentation.c:752
- msgid "Jump to page:"
 --- evince-3.28.4/po/sl.po
 +++ evince-3.28.4/po/sl.po
 @@ -668,6 +668,10 @@ msgstr "Skoči na datoteko »%s«"
  msgid "Launch %s"
  msgstr "Zaženi %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Ponastavi obrazec"
 +
  #: ../libview/ev-view-presentation.c:752
  msgid "Jump to page:"
  msgstr "Pojdi na stran:"
---- evince-3.28.4/po/sr.po
-+++ evince-3.28.4/po/sr.po
-@@ -671,6 +671,10 @@ msgstr "Иди на датотеку „
- 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/sv.po
 +++ evince-3.28.4/po/sv.po
 @@ -676,6 +676,10 @@ msgstr "Gå till filen ”%s”"
  msgid "Launch %s"
  msgstr "Starta %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Återställ formulär"
 +
@@ -394,7 +225,7 @@
  msgid "Launch %s"
  msgstr "%s başlat"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Formu sıfırla"
 +
@@ -407,7 +238,7 @@
  msgid "Launch %s"
  msgstr "Запустити %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "Відновити початковий стан форми"
 +
@@ -420,7 +251,7 @@
  msgid "Launch %s"
  msgstr "调用 %s"
  
-+#: ../libview/ev-view.c:2172
++#: libview/ev-view.c:2172
 +msgid "Reset form"
 +msgstr "重置表单"
 +
diff --git a/SPECS/evince.spec b/SPECS/evince.spec
index 9aa7243..399aed4 100644
--- a/SPECS/evince.spec
+++ b/SPECS/evince.spec
@@ -5,7 +5,7 @@
 
 Name:           evince
 Version:        3.28.4
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
@@ -37,6 +37,9 @@ Patch12:        evince-3.28.4-reset-form-action.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1896006
 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 +268,14 @@ 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
+* 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"