diff --git a/.gitignore b/.gitignore
index cd22936..acc9002 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,8 @@ ibus-m17n-1.3.0.tar.gz
/ibus-m17n-1.4.1.tar.gz
/ibus-m17n-1.4.2.tar.gz
/ibus-m17n-1.4.3.tar.gz
+/ibus-m17n-1.4.4.tar.gz
+/ibus-m17n-1.4.5.tar.gz
+/ibus-m17n-1.4.6.tar.gz
+/ibus-m17n-1.4.7.tar.gz
+/ibus-m17n-1.4.8.tar.gz
diff --git a/ibus-m17n-enable-ar-kbd.patch b/ibus-m17n-enable-ar-kbd.patch
deleted file mode 100644
index 37f1e9e..0000000
--- a/ibus-m17n-enable-ar-kbd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ibus-m17n-1.3.4/src/default.xml.old 2016-12-20 11:07:26.242523223 +0530
-+++ ibus-m17n-1.3.4/src/default.xml 2016-12-20 11:11:42.392527990 +0530
-@@ -18,6 +18,13 @@
- m17n:*:kbd
- -1
-
-+
-+
-+ m17n:ar:kbd
-+ 1
-+
-+
-
-
- m17n:zh:py
diff --git a/ibus-m17n-xkb-options.patch b/ibus-m17n-xkb-options.patch
deleted file mode 100644
index 5e39e44..0000000
--- a/ibus-m17n-xkb-options.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: ibus-m17n-1.3.4/src/default.xml
-===================================================================
---- ibus-m17n-1.3.4.orig/src/default.xml
-+++ ibus-m17n-1.3.4/src/default.xml
-@@ -184,6 +184,15 @@
- m17n:si:samanala
- 0
-
-+
-+
-+ m17n:*:inscript*
-+ default[lv3:ralt_switch]
-+
-+
-+ m17n:si:*
-+ default[lv3:ralt_switch]
-+
-
-
- m17n:zh:cangjie
-Index: ibus-m17n-1.3.4/src/m17nutil.c
-===================================================================
---- ibus-m17n-1.3.4.orig/src/m17nutil.c
-+++ ibus-m17n-1.3.4/src/m17nutil.c
-@@ -17,7 +17,8 @@ typedef enum {
- ENGINE_CONFIG_RANK_MASK = 1 << 0,
- ENGINE_CONFIG_SYMBOL_MASK = 1 << 1,
- ENGINE_CONFIG_LONGNAME_MASK = 1 << 2,
-- ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 3
-+ ENGINE_CONFIG_LAYOUT_MASK = 1 << 3,
-+ ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 4
- } EngineConfigMask;
-
- struct _EngineConfigNode {
-@@ -137,7 +138,7 @@ ibus_m17n_engine_new (MSymbol lang,
- "language", msymbol_name (lang),
- "license", "GPL",
- "icon", engine_icon ? engine_icon : "",
-- "layout", "default",
-+ "layout", config->layout ? config->layout : "default",
- "rank", config->rank,
- "symbol", config->symbol ? config->symbol : "",
- "setup", engine_setup,
-@@ -272,6 +273,8 @@ ibus_m17n_get_engine_config (const gchar
- config->symbol = cnode->config.symbol;
- if (cnode->mask & ENGINE_CONFIG_LONGNAME_MASK)
- config->longname = cnode->config.longname;
-+ if (cnode->mask & ENGINE_CONFIG_LAYOUT_MASK)
-+ config->layout = cnode->config.layout;
- if (cnode->mask & ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK)
- config->preedit_highlight = cnode->config.preedit_highlight;
- }
-@@ -314,6 +317,12 @@ ibus_m17n_engine_config_parse_xml_node (
- cnode->mask |= ENGINE_CONFIG_LONGNAME_MASK;
- continue;
- }
-+ if (g_strcmp0 (sub_node->name , "layout") == 0) {
-+ g_free (cnode->config.layout);
-+ cnode->config.layout = g_strdup (sub_node->text);
-+ cnode->mask |= ENGINE_CONFIG_LAYOUT_MASK;
-+ continue;
-+ }
- if (g_strcmp0 (sub_node->name , "preedit-highlight") == 0) {
- if (g_ascii_strcasecmp ("TRUE", sub_node->text) == 0)
- cnode->config.preedit_highlight = TRUE;
-Index: ibus-m17n-1.3.4/src/m17nutil.h
-===================================================================
---- ibus-m17n-1.3.4.orig/src/m17nutil.h
-+++ ibus-m17n-1.3.4/src/m17nutil.h
-@@ -20,6 +20,9 @@ struct _IBusM17NEngineConfig {
- /* overridding longname shown on panel */
- gchar *longname;
-
-+ /* keyboard layout */
-+ gchar *layout;
-+
- /* whether to highlight preedit */
- gboolean preedit_highlight;
- };
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index c3ced76..aca1512 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -1,8 +1,8 @@
%global require_ibus_version 1.4.0
Name: ibus-m17n
-Version: 1.4.3
-Release: 2%{?dist}
+Version: 1.4.8
+Release: 1%{?dist}
Summary: The M17N engine for IBus platform
License: GPLv2+
URL: https://github.com/ibus/ibus-m17n
@@ -11,23 +11,17 @@ Source0: https://github.com/ibus/%{name}/archive/%{version}/%{name}-%{version
# Upstreamed patches:
# Fedora specific patches:
-# Enable lv3:ralt_switch option for some Indic engines in default.xml.
-Patch100: ibus-m17n-xkb-options.patch
# Don't make the status button clickable (maybe obsolete).
-Patch101: ibus-m17n-hide-title-status.patch
-# Use ar-kbd as default keymap for Arabic
-# https://bugzilla.redhat.com/show_bug.cgi?id=1076945
-Patch103: ibus-m17n-enable-ar-kbd.patch
+Patch100: ibus-m17n-hide-title-status.patch
BuildRequires: gettext-devel >= 0.19
BuildRequires: libtool
-BuildRequires: pkgconfig
-BuildRequires: gnome-common
BuildRequires: m17n-lib-devel
BuildRequires: gtk3-devel
BuildRequires: ibus-devel >= %{require_ibus_version}
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
+BuildRequires: make
Requires: ibus >= %{require_ibus_version}
Requires: m17n-lib
@@ -39,9 +33,7 @@ the input table maps from m17n-db.
%prep
%setup -q
-%patch100 -p1 -b .xkb-options
-%patch101 -p1 -b .hide-title-status
-%patch103 -p1 -b .enable-ar-kbd
+%patch100 -p1 -b .hide-title-status
%build
@@ -71,6 +63,39 @@ make check
%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.m17n.gschema.xml
%changelog
+* Tue Oct 19 2021 Mike FABIAN - 1.4.8-1
+- Update to 1.4.8
+- Remove gnome-common requirement and re-write autogen.sh (by Parag Nemade)
+ (Resolves: https://github.com/ibus/ibus-m17n/pull/37)
+- Translation update from Weblate for Sinhala
+
+* Tue Oct 19 2021 Parag Nemade - 1.4.7-2
+- Remove BR: gnome-common and pkgconfig as it is not needed for released tarball
+
+* Fri Aug 13 2021 Mike FABIAN - 1.4.7-1
+- Update to 1.4.7
+- Assign symbols to all the new inscript2 engines (and add some other missing symbols)
+ (Resolves: https://github.com/ibus/ibus-m17n/issues/34)
+- Allow to use kbd engines (#32)
+ (Resolves: https://github.com/ibus/ibus-m17n/issues/32)
+- ibus-m17n-xkb-options.patch from Fedora included upstream
+- ibus-m17n-enable-ar-kbd.patch from Fedora included upstream
+
+* Thu Jul 15 2021 Mike FABIAN - 1.4.6-1
+- Update to 1.4.6
+- Make inscript2 engines rank higher than inscript engines
+- Resolves: rhbz#1982546
+
+* Fri Mar 12 2021 Mike FABIAN - 1.4.5-1
+- Update to 1.4.5
+- Use ibus_engine_update_preedit_with_mode() *always* with IBUS_ENGINE_PREEDIT_COMMIT mode
+- Translation update from Weblate, bn new and 100% complete, pt_BR now 100% complete
+- Remove redundant target for desktop.in file
+
+* Thu Jan 28 2021 Mike FABIAN - 1.4.4-1
+- Update to 1.4.4
+- Translation update from Weblate, zh_CN now 100% complete.
+
* Tue Jul 28 2020 Fedora Release Engineering - 1.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index cade708..4d9d7c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ibus-m17n-1.4.3.tar.gz) = 8b42bcac8662b4924f54b6fe56427b32603746a3d1b0dfafb6dfec1296ec52847119f94fabb0a276f9de5918414fdf5f7b5aceaaabd8c01632cfd677344598ab
+SHA512 (ibus-m17n-1.4.8.tar.gz) = 3e808ffc3b7d03a745be1009a58c8d03ecabe15478f7bf36d70b777d342ad04d0f5574bb78743bcb67ab36674d316aef3cd7070d48ef9e11d07f960d75597aec