From 17afd8a114e4d23507ab57e357967d71cd6360ea Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 18 Dec 2020 07:59:26 +0000
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/langpacks.git#093f4a636ddafe47e0f16cb37cf1c1bde2a26d62
---
 langpacks.spec | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/langpacks.spec b/langpacks.spec
index 707546c..7222a25 100644
--- a/langpacks.spec
+++ b/langpacks.spec
@@ -1,6 +1,6 @@
 Name:      langpacks
 Version:   3.0
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   Langpacks meta-package
 
 License:   GPLv2+
@@ -970,7 +970,11 @@ This package provides Sinhala langpacks meta-package.
 %files si
 %{_datadir}/metainfo/org.fedoraproject.LangPack-si.metainfo.xml
 
+%if 0%{?rhel} && 0%{?rhel} >= 9
+%langcore_pkg -l si -n Sinhala -f google-noto-sans-sinhala-vf-fonts -i ibus-m17n
+%else
 %langcore_pkg -l si -n Sinhala -f google-noto-sans-sinhala-vf-fonts -i ibus-sayura ibus-m17n
+%endif
 
 %package sk
 Summary: Slovak langpacks meta-package
@@ -1188,7 +1192,11 @@ This package provides Vietnamese langpacks meta-package.
 %files vi
 %{_datadir}/metainfo/org.fedoraproject.LangPack-vi.metainfo.xml
 
+%if 0%{?rhel} && 0%{?rhel} >= 9
+%langcore_pkg -l vi -n Vietnamese -i ibus-m17n
+%else
 %langcore_pkg -l vi -n Vietnamese -i ibus-bogo
+%endif
 
 %package xh
 Summary: Xhosa langpacks meta-package
@@ -1283,6 +1291,9 @@ DESTDIR=%{buildroot} appstream-util split-appstream %{SOURCE1}
 DESTDIR=%{buildroot} appstream-util split-appstream %{SOURCE2}
 
 %changelog
+* Thu Dec 17 2020 Parag Nemade <pnemade AT redhat DOT com> - 3.0-6
+- Change default for Sinhala and Vietnamese to use ibus-m17n keymaps
+
 * Wed Sep 16 2020 Parag Nemade <pnemade AT redhat DOT com> - 3.0-5
 - Resolves: Fix broken dependency for langpacks-core-font-km (#1879141)