[rpms/ibus] autotool: Update simple.xml with layout_variant

[rpms/ibus] autotool: Update simple.xml with layout_variant

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 652774a06c5e9f539cc3ecabcd1b2fdcad6f461b
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2020-08-21T22:37:05+09:00
Stats  : +49/-3 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/652774a06c5e9f539cc3ecabcd1b2fdcad6f461b?branch=autotool

Log:
Update simple.xml with layout_variant

---
diff --git a/.gitignore b/.gitignore
index 0119b7f..697487b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@ ibus-1.3.6.tar.gz
 /ibus-1.5.21.tar.gz
 /ibus-1.5.22.tar.gz
 /ibus-simple-1.5.22.20200821.xml.gz
+/ibus-simple-1.5.22.20200821.2.xml.gz

diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 3b145c5..a43f256 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -2084,3 +2084,45 @@ index 43990d5f..3386a5d1 100644
 -- 
 2.24.1
 
+From 568d58dfadefa801b96058c1155daecff3d51605 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 21 Aug 2020 22:07:31 +0900
+Subject: [PATCH] engine: Add layout_variant in gensimple.py
+
+Missed to handle layout_variant and also add latam layouts to denylist
+
+BUG=https://github.com/ibus/ibus/issues/2153
+---
+ engine/denylist.txt | 1 +
+ engine/gensimple.py | 5 +++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/engine/denylist.txt b/engine/denylist.txt
+index e4cd0473..9cbc7fc3 100644
+--- a/engine/denylist.txt
++++ b/engine/denylist.txt
+@@ -24,4 +24,5 @@
+ # Asterisk(*) character can be used to match any engines.
+ # E.g. xkb:cn:*:* excludes xkb:cn::zho and xkb:cn:mon_trad:mvf
+ xkb:cn:*:*
++xkb:latam:*:*
+ xkb:nec_vndr/jp:*:*
+diff --git a/engine/gensimple.py b/engine/gensimple.py
+index dc4ccf12..18f7dc8c 100755
+--- a/engine/gensimple.py
++++ b/engine/gensimple.py
+@@ -180,6 +180,11 @@ class EvdevXML(XMLFilterBase):
+             self.__downstream.startElement('layout', AttributesImpl({}))
+             self.__downstream.characters(self.__layout)
+             self.__downstream.endElement('layout')
++            if self.__variant != '':
++                self.__downstream.startElement('layout_variant',
++                                               AttributesImpl({}))
++                self.__downstream.characters(self.__variant)
++                self.__downstream.endElement('layout_variant')
+             self.__downstream.startElement('longname', AttributesImpl({}))
+             self.__downstream.characters(self.__description)
+             self.__downstream.endElement('longname')
+-- 
+2.24.1
+

diff --git a/ibus.spec b/ibus.spec
index 38fe2f7..d43071a 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -26,14 +26,14 @@
 
 Name:           ibus
 Version:        1.5.22
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
 Source0:        https://github.com/ibus/%name/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}-xinput
 Source2:        %{name}.conf.5
-Source3:        %{name}-simple-1.5.22.20200821.xml.gz
+Source3:        %{name}-simple-1.5.22.20200821.2.xml.gz
 # Patch0:         %%{name}-HEAD.patch
 Patch0:         %{name}-HEAD.patch
 # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
@@ -458,6 +458,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Fri Aug 21 2020 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.22-13
+- Update simple.xml with layout_variant
+
 * Fri Aug 21 2020 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.22-12
 - Generate simple.xml with denylist
 - Tell Pango about the engine language in the candidate panel

diff --git a/sources b/sources
index 4629f12..f877d4e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (ibus-1.5.22.tar.gz) = 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
-SHA512 (ibus-simple-1.5.22.20200821.xml.gz) = f7532078bd409da0742538745d5d03942dd738a9bea935f75c9c0d74ad9891ff62fe7982a7c64ab957079583a12316d593f7f05534fa78a5c741eb5fb19f9da7
+SHA512 (ibus-simple-1.5.22.20200821.2.xml.gz) = 7c698e1a06da8e120d13c324d0eecad6ee0094e59cae2d9d5782e027c30de0e0259c6116919481e0438698bf20867cd2dad51ee90fb37a2fe1bde242e03920a5