From afd6c8bcb5c21fd322ffb55216538b2e33bb0529 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 27 Oct 2020 21:18:42 +0100
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libreoffice.git#9ae64616817ec75d0fbc2b9c2c005d9f71befd8a
---
 ...gest-package-install-of-the-most-app.patch | 37 +++++++++++++++++++
 libreoffice.spec                              | 13 +++++--
 2 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch

diff --git a/0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch b/0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch
new file mode 100644
index 0000000..0741f41
--- /dev/null
+++ b/0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch
@@ -0,0 +1,37 @@
+From 42c62def5f94ae070ac98bd75e3da1381982ebe7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Sun, 25 Oct 2020 20:39:50 +0000
+Subject: [PATCH] rhbz#1891326 suggest package install of the most appropiate
+ pt langpack
+
+Change-Id: I87ff1a941a3a5dc0c321440a9c286ae73c9d0384
+---
+ svtools/source/misc/langhelp.cxx | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
+index e64a3b869076..9f1e84ba4580 100644
+--- a/svtools/source/misc/langhelp.cxx
++++ b/svtools/source/misc/langhelp.cxx
+@@ -139,6 +139,18 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString
+                         aPackages.emplace_back("libreoffice-langpack-zh-Hans");
+                     else if (MsLangId::isTraditionalChinese(eType))
+                         aPackages.emplace_back("libreoffice-langpack-zh-Hant");
++                    else if (install == "pt")
++                    {
++                        if (aWantedTag.getCountry().equalsIgnoreAsciiCase("PT"))
++                            aPackages.emplace_back("libreoffice-langpack-pt-PT");
++                        else if (aWantedTag.getCountry().equalsIgnoreAsciiCase("BR"))
++                            aPackages.emplace_back("libreoffice-langpack-pt-BR");
++                        else
++                        {
++                            aPackages.emplace_back("libreoffice-langpack-pt-PT");
++                            aPackages.emplace_back("libreoffice-langpack-pt-BR");
++                        }
++                    }
+                     else
+                         aPackages.emplace_back("libreoffice-langpack-" + install);
+                 }
+-- 
+2.26.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 167a5b3..c869ed6 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -50,7 +50,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        1%{?libo_prerelease}%{?dist}
+Release:        3%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -252,6 +252,7 @@ Patch5: 0001-Upgrade-liborcus-to-0.16.0.patch
 %endif
 Patch6: 0001-rhbz-1882616-move-cursor-one-step-at-a-time-in-the-d.patch
 Patch7: 0001-export-HYPERLINK-target-in-html-clipboard-export.patch
+Patch8: 0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch
 
 %if 0%{?rhel}
 # not upstreamed
@@ -618,9 +619,9 @@ Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
 Provides: %{name}-plugin = %{epoch}:%{version}-%{release}
 Provides: %{name}-plugin%{?_isa} = %{epoch}:%{version}-%{release}
 Obsoletes: libreoffice-kde4 < 1:6.3.0.0
-Obsoletes: libreoffice-kde5 < 1:6.4.5.3
+Obsoletes: libreoffice-kde5 < 1:6.4.7.3
 Obsoletes: libreoffice-kde4-debuginfo < 1:6.3.0.0
-Obsoletes: libreoffice-kde5-debuginfo < 1:6.4.5.3
+Obsoletes: libreoffice-kde5-debuginfo < 1:6.4.7.3
 Supplements: (%{name}-core%{?_isa} and plasma-workspace)
 
 %description kf5
@@ -2232,6 +2233,12 @@ done
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Sun Oct 25 2020 Caolán McNamara <caolanm@redhat.com> - 1:7.0.2.2-3
+- Resolves: rhbz#1891326 suggest package install of the best pt-* langpack
+
+* Sat Oct 24 18:45:56 CEST 2020 David Tardon <dtardon@redhat.com> - 1:7.0.2.2-2
+- fix upgrade from Fedora 32
+
 * Sat Oct 10 2020 Caolán McNamara <caolanm@redhat.com> - 1:7.0.2.2-1
 - latest version