From 9fe0956e22a3f749a29f7f2df426b0afb24ec9bf Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 27 Oct 2020 20:57:51 +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/ibus-libpinyin.git#32b7e1167e18970454271e5d89df1b5c4e7f7ed1
---
 .gitignore                       |  1 +
 ibus-libpinyin-1.12.x-head.patch | 72 --------------------------------
 ibus-libpinyin.spec              | 10 +++--
 sources                          |  2 +-
 4 files changed, 9 insertions(+), 76 deletions(-)

diff --git a/.gitignore b/.gitignore
index a7485ad..d021ef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /ibus-libpinyin-1.11.91.tar.gz
 /ibus-libpinyin-1.11.92.tar.gz
 /ibus-libpinyin-1.11.93.tar.gz
+/ibus-libpinyin-1.11.94.tar.gz
diff --git a/ibus-libpinyin-1.12.x-head.patch b/ibus-libpinyin-1.12.x-head.patch
index 616739b..e69de29 100644
--- a/ibus-libpinyin-1.12.x-head.patch
+++ b/ibus-libpinyin-1.12.x-head.patch
@@ -1,72 +0,0 @@
-commit 2ee257c73388df89b4f5966c882d8047a896f9b2
-Author: Peng Wu <alexepico@gmail.com>
-Date:   Fri Aug 28 11:30:31 2020 +0800
-
-    restore mainSwitch shortcut key
-
-diff --git a/src/PYPPinyinEngine.cc b/src/PYPPinyinEngine.cc
-index dcd2e3f..295adc5 100644
---- a/src/PYPPinyinEngine.cc
-+++ b/src/PYPPinyinEngine.cc
-@@ -166,8 +166,10 @@ PinyinEngine::processAccelKeyEvent (guint keyval, guint keycode,
-          * and no other key event between the press and release key event */
-         gboolean triggered = FALSE;
- 
--        if (PinyinConfig::instance ().mainSwitch () == accel) {
--            triggered = TRUE;
-+        if (m_prev_pressed_key == keyval) {
-+            if (PinyinConfig::instance ().mainSwitch () == accel) {
-+                triggered = TRUE;
-+            }
-         }
- 
-         if (triggered) {
-From c346468fdf9ef8f7f6c8acd0dc54b976b1dafd14 Mon Sep 17 00:00:00 2001
-From: Peng Wu <alexepico@gmail.com>
-Date: Tue, 29 Sep 2020 11:33:27 +0800
-Subject: [PATCH] Fixes import/export dictionary in setup dialog
-
----
- setup/main2.py | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/setup/main2.py b/setup/main2.py
-index adbebe9..f2d5847 100644
---- a/setup/main2.py
-+++ b/setup/main2.py
-@@ -435,10 +435,11 @@ class PreferencesDialog:
- 
-     def __import_dictionary_cb(self, widget):
-         dialog = Gtk.FileChooserDialog \
--            (_("Please choose a file"), self.__dialog,
--             Gtk.FileChooserAction.OPEN,
--             (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
--              Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
-+            (title = _("Please choose a file"), parent = self.__dialog,
-+             action = Gtk.FileChooserAction.OPEN)
-+
-+        dialog.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-+                           Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
- 
-         filter_text = Gtk.FileFilter()
-         filter_text.set_name("Text files")
-@@ -453,10 +454,12 @@ class PreferencesDialog:
- 
-     def __export_dictionary_cb(self, widget):
-         dialog = Gtk.FileChooserDialog \
--                 (_("Please save a file"), self.__dialog,
--                  Gtk.FileChooserAction.SAVE,
--                  (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
--                   Gtk.STOCK_SAVE, Gtk.ResponseType.OK))
-+                 (title = _("Please save a file"), parent = self.__dialog,
-+                  action = Gtk.FileChooserAction.SAVE)
-+
-+        dialog.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-+                           Gtk.STOCK_SAVE, Gtk.ResponseType.OK)
-+
-         dialog.set_do_overwrite_confirmation(True)
- 
-         filter_text = Gtk.FileFilter()
--- 
-2.26.2
-
diff --git a/ibus-libpinyin.spec b/ibus-libpinyin.spec
index 7338ff3..4a4248f 100644
--- a/ibus-libpinyin.spec
+++ b/ibus-libpinyin.spec
@@ -1,8 +1,8 @@
-%global snapshot 1
+%global snapshot 0
 
 Name:       ibus-libpinyin
-Version:    1.11.93
-Release:    3%{?dist}
+Version:    1.11.94
+Release:    1%{?dist}
 Summary:    Intelligent Pinyin engine based on libpinyin for IBus
 License:    GPLv3+
 URL:        https://github.com/libpinyin/ibus-libpinyin
@@ -88,6 +88,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-libbopo
 %{_datadir}/ibus/component/*
 
 %changelog
+* Thu Oct 22 2020 Peng Wu <pwu@redhat.com> - 1.11.94-1
+- Update to 1.11.94
+- bug fixes
+
 * Mon Oct 12 2020 Peng Wu <pwu@redhat.com> - 1.11.93-3
 - Fixes python3-gobject warning in setup dialog
 
diff --git a/sources b/sources
index a517a09..82f0d67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ibus-libpinyin-1.11.93.tar.gz) = 03e84fd84acc24ed4d1037e37d1631abf3db6326b86775fd9b6e4e241b3612c52f1ae69c8919771868bed6533506f5cc9b0f34f799f7df04e22f4ed448548145
+SHA512 (ibus-libpinyin-1.11.94.tar.gz) = 9ccf0d792d379a95be81dc3173e78fbdab499b74d2990fd6dda6afc3713935d34b6956f1cfecc1536d8cfc1407470aeb995abab37afb829b327e24b1103c2345