4 changed files with 184 additions and 101 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/ibus-libpinyin-1.12.0.tar.gz
+SOURCES/ibus-libpinyin-1.10.0.tar.gz
--- a/.ibus-libpinyin.metadata
+++ b/.ibus-libpinyin.metadata
@ -1 +1 @@
-7544d4763c2660c98d3c120bd55988ce3b6a6295 SOURCES/ibus-libpinyin-1.12.0.tar.gz
+7843f647ba1d417055029277a53fc852cef00c5b SOURCES/ibus-libpinyin-1.10.0.tar.gz
--- a/SOURCES/ibus-libpinyin-fixes-period-and-comma-handling.patch
+++ b/SOURCES/ibus-libpinyin-fixes-period-and-comma-handling.patch
@ -0,0 +1,158 @@
+From 1eb70ce12bed9d6b53c02ac8693ec52abe1d0216 Mon Sep 17 00:00:00 2001
+From: Peng Wu <pwu@redhat.com>
+Date: Wed, 20 Nov 2019 19:12:47 +0800
+Subject: [PATCH 1/3] fixes period handling
+
+---
+ src/PYFallbackEditor.cc | 1 +
+ src/PYPPinyinEditor.cc  | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/PYFallbackEditor.cc b/src/PYFallbackEditor.cc
+index e3dcfba..12985f4 100644
+--- a/src/PYFallbackEditor.cc
+++ b/src/PYFallbackEditor.cc
+@@ -219,6 +219,7 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
+         case IBUS_A ... IBUS_Z:
+             if (modifiers == 0) {
+                 if (!m_props.modeFull ())
+                    m_prev_committed_char = keyval;
+                     return FALSE;
+ 
+                 commit (HalfFullConverter::toFull (keyval));
+diff --git a/src/PYPPinyinEditor.cc b/src/PYPPinyinEditor.cc
+index d2741b0..55bbb63 100644
+--- a/src/PYPPinyinEditor.cc
+++ b/src/PYPPinyinEditor.cc
+@@ -130,7 +130,7 @@ PinyinEditor::processPunct (guint keyval, guint keycode,
+         return FALSE;
+     }
+ 
+-    return TRUE;
+    return FALSE;
+ }
+ 
+ inline gboolean
+-- 
+2.26.2
+
+
+From 592b628000d9b58bb714ff9232d7d2ddf814cacf Mon Sep 17 00:00:00 2001
+From: Peng Wu <pwu@redhat.com>
+Date: Thu, 21 Nov 2019 14:45:28 +0800
+Subject: [PATCH 2/3] fixes period handling again
+
+---
+ src/PYFallbackEditor.cc | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/PYFallbackEditor.cc b/src/PYFallbackEditor.cc
+index 12985f4..3d03b49 100644
+--- a/src/PYFallbackEditor.cc
+++ b/src/PYFallbackEditor.cc
+@@ -218,9 +218,10 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
+         case IBUS_a ... IBUS_z:
+         case IBUS_A ... IBUS_Z:
+             if (modifiers == 0) {
+-                if (!m_props.modeFull ())
+                if (!m_props.modeFull ()) {
+                     m_prev_committed_char = keyval;
+                     return FALSE;
+                }
+ 
+                 commit (HalfFullConverter::toFull (keyval));
+                 retval = TRUE;
+@@ -261,8 +262,10 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
+             keyval = IBUS_space;
+         case IBUS_space:
+             if (modifiers == 0) {
+-                if (!m_props.modeFull ())
+                if (!m_props.modeFull ()) {
+                    m_prev_committed_char = keyval;
+                     return FALSE;
+                }
+ 
+                 commit ("　");
+                 retval = TRUE;
+@@ -272,6 +275,9 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
+         default:
+             break;
+     }
+
+    if (!retval)
+        m_prev_committed_char = keyval;
+     return retval;
+ }
+ 
+-- 
+2.26.2
+
+
+From 17121ad1dbc8c9be44d449c2d79179cdd90f6d7c Mon Sep 17 00:00:00 2001
+From: Peng Wu <pwu@redhat.com>
+Date: Fri, 29 Nov 2019 13:23:16 +0800
+Subject: [PATCH 3/3] fixes comma handling
+
+---
+ src/PYFallbackEditor.cc | 32 ++++++++++++++++++++++++--------
+ 1 file changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/src/PYFallbackEditor.cc b/src/PYFallbackEditor.cc
+index 3d03b49..6020591 100644
+--- a/src/PYFallbackEditor.cc
+++ b/src/PYFallbackEditor.cc
+@@ -76,13 +76,21 @@ FallbackEditor::processPunctForSimplifiedChinese (guint keyval, guint keycode, g
+         m_double_quote = !m_double_quote;
+         return TRUE;
+     case ',':
+-        commit ("，"); return TRUE;
+        if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9') {
+            m_prev_committed_char = keyval;
+            return FALSE;
+        } else {
+            commit ("，");
+            return TRUE;
+        }
+     case '.':
+-        if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9')
+        if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9') {
+            m_prev_committed_char = keyval;
+             return FALSE;
+-        else
+        } else {
+             commit ("。");
+-        return TRUE;
+            return TRUE;
+        }
+     case '<':
+         commit ("《"); return TRUE;
+     case '>':
+@@ -144,13 +152,21 @@ FallbackEditor::processPunctForTraditionalChinese (guint keyval, guint keycode,
+         m_double_quote = !m_double_quote;
+         return TRUE;
+     case ',':
+-        commit ("，"); return TRUE;
+        if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9') {
+            m_prev_committed_char = keyval;
+            return FALSE;
+        } else {
+            commit ("，");
+            return TRUE;
+        }
+     case '.':
+-        if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9')
+        if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9') {
+            m_prev_committed_char = keyval;
+             return FALSE;
+-        else
+        } else {
+             commit ("。");
+-        return TRUE;
+            return TRUE;
+        }
+     case '<':
+         commit ("《"); return TRUE;
+     case '>':
+-- 
+2.26.2
+
--- a/SPECS/ibus-libpinyin.spec
+++ b/SPECS/ibus-libpinyin.spec
@ -1,20 +1,23 @@
 %global snapshot 0

 Name:       ibus-libpinyin
-Version:    1.12.0
-Release:    5%{?dist}
+Version:    1.10.0
+Release:    2%{?dist}
 Summary:    Intelligent Pinyin engine based on libpinyin for IBus
-License:    GPLv3+
+License:    GPLv2+
+Group:      System Environment/Libraries
 URL:        https://github.com/libpinyin/ibus-libpinyin
 Source0:    http://downloads.sourceforge.net/libpinyin/ibus-libpinyin/%{name}-%{version}.tar.gz
 %if %snapshot
-Patch0:     ibus-libpinyin-1.12.x-head.patch
+Patch0:     ibus-libpinyin-1.10.x-head.patch
 %endif
+Patch1:     ibus-libpinyin-fixes-period-and-comma-handling.patch

 Requires:       python3-gobject
 Requires:       ibus >= 1.5.11
 BuildRequires:  gcc-c++
 BuildRequires:  gettext-devel
+BuildRequires:  intltool
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  sqlite-devel
@ -24,7 +27,6 @@ BuildRequires:  python3-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  ibus-devel >= 1.5.11
 BuildRequires:  libpinyin-devel >= 2.1.0
-BuildRequires: make

 # Requires(post): sqlite

@ -41,6 +43,7 @@ input method based on libpinyin for IBus.
 %if %snapshot
 %patch0 -p1 -b .head
 %endif
+%patch1 -p1 -b .period

 %build
 %configure --disable-static \
@ -48,22 +51,28 @@ input method based on libpinyin for IBus.
           --disable-boost

 # make -C po update-gmo
-%make_build
+make %{?_smp_mflags}

 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-libpinyin.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-libbopomofo.desktop

 %install
-%make_install
-
-%py_byte_compile %{python3} $RPM_BUILD_ROOT%{_datadir}/ibus-libpinyin/setup
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

 %find_lang %{name}

+%post
+[ -x %{_bindir}/ibus ] && \
+  %{_bindir}/ibus write-cache --system &>/dev/null || :
+
+%postun
+[ -x %{_bindir}/ibus ] && \
+  %{_bindir}/ibus write-cache --system &>/dev/null || :
+
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
-%{_datadir}/metainfo/*.appdata.xml
+%{_datadir}/appdata/*.appdata.xml
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
 %{_datadir}/applications/ibus-setup-libpinyin.desktop
 %{_datadir}/applications/ibus-setup-libbopomofo.desktop
@ -73,7 +82,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-libbopo
 %{_datadir}/ibus-libpinyin/setup
 %{_datadir}/ibus-libpinyin/base.lua
 %{_datadir}/ibus-libpinyin/user.lua
-%{_datadir}/ibus-libpinyin/network.txt
 %{_datadir}/ibus-libpinyin/db/english.db
 %{_datadir}/ibus-libpinyin/db/strokes.db
 %dir %{_datadir}/ibus-libpinyin
@ -81,95 +89,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-libbopo
 %{_datadir}/ibus/component/*

 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.12.0-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Mon Jul 19 2021 Peng Wu <pwu@redhat.com> - 1.12.0-4
- Clean up ibus write-cache in scriptlet
- Resolves: #1974629
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.12.0-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 15 2020 Peng Wu <pwu@redhat.com> - 1.12.0-1
- Update to 1.12.0
- bug fixes
-
-* 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
-
-* Sun Sep 27 2020 Peng Wu <pwu@redhat.com> - 1.11.93-2
- Fixes Shift key switch issue
-
-* Wed Aug 26 2020 Peng Wu <pwu@redhat.com> - 1.11.93-1
- Update to 1.11.93
- switch to use GPLv3+ license
- support network dictionary
- bug fixes
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.92-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 1.11.92-3
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Mon Jul 13 2020 Peng Wu <pwu@redhat.com> - 1.11.92-2
- Switch to use py_byte_compile rpm macro
-
-* Thu Mar 19 2020 Peng Wu <pwu@redhat.com> - 1.11.92-1
- Update to 1.11.92
- fixes desktop files
-
-* Thu Mar 19 2020 Peng Wu <pwu@redhat.com> - 1.11.91-1
- Update to 1.11.91
- support compact display style
- bug fixes
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon May 20 2019 Peng Wu <pwu@redhat.com> - 1.11.1-1
- Update to 1.11.1
- use gettext
- add emoji-candidate option
- fixes SuggestionEditor
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 21 2019 Peng Wu <pwu@redhat.com> - 1.11.0-1
- Update to 1.11.0
- fixes keypad decimal
- fixes emoji candidates
- support configurable opencc config
-
-* Wed Oct 31 2018 Peng Wu <pwu@redhat.com> - 1.10.92-1
- Update to 1.10.92
- fixes Enter handling
-
-* Thu Oct 11 2018 Peng Wu <pwu@redhat.com> - 1.10.91-1
- Update to 1.10.91
- support ime.register_trigger in lua extension
- support predicted candidates
- support emoji input
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.10.0-2
+- Rebuilt for MSVSphere 8.8

-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.10.0-2
- Rebuilt for Python 3.7
+* Tue Oct 27 2020 Peng Wu <pwu@redhat.com> - 1.10.0-2
+- Fixes period and comma handling
+- Resolves: #1857750

 * Tue Apr 17 2018 Peng Wu <pwu@redhat.com> - 1.10.0-1
 - Update to 1.10.0