.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -4,3 +4,8 @@ ibus-m17n-1.3.0.tar.gz
 /ibus-m17n-1.3.2.tar.gz
 /ibus-m17n-1.3.3.tar.gz
 /ibus-m17n-1.3.4.tar.gz
+/ibus-m17n-1.4.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.metadata

@@ -0,0 +1 @@
+781d983de1fdd9e40eaee7e465ef9dfc6836a13a ibus-m17n-1.4.4.tar.gz

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

ibus-m17n-content-type.patch

@@ -1,97 +0,0 @@
-From e995acb046c9e6bd3ee48cb0cf1ccf9d754546e7 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-Date: Thu, 6 Nov 2014 16:05:52 +0900
-Subject: [PATCH] engine: Disable key processing on password input
-
----
- src/engine.c | 35 +++++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
-Index: ibus-m17n-1.3.4/src/engine.c
-===================================================================
---- ibus-m17n-1.3.4.orig/src/engine.c
-+++ ibus-m17n-1.3.4/src/engine.c
-@@ -24,6 +24,7 @@ struct _IBusM17NEngine {
- #endif  /* HAVE_SETUP */
-     IBusPropList    *prop_list;
-     IBusKeymap      *us_keymap;
-+    gboolean         has_focus;
- };
- 
- struct _IBusM17NEngineClass {
-@@ -75,6 +76,10 @@ static void ibus_m17n_engine_property_ac
-                                             (IBusEngine             *engine,
-                                              const gchar            *prop_name,
-                                              guint                   prop_state);
-+static void ibus_m17n_engine_set_content_type
-+                                            (IBusEngine             *engine,
-+                                             IBusInputPurpose        purpose,
-+                                             IBusInputHints          hints);
- 
- static void ibus_m17n_engine_commit_string
-                                             (IBusM17NEngine         *m17n,
-@@ -226,6 +231,8 @@ ibus_m17n_engine_class_init (IBusM17NEng
- 
-     engine_class->property_activate = ibus_m17n_engine_property_activate;
- 
-+    engine_class->set_content_type = ibus_m17n_engine_set_content_type;
-+
-     if (!ibus_m17n_scan_class_name (G_OBJECT_CLASS_NAME (klass),
-                                     &lang, &name)) {
-         g_free (lang);
-@@ -667,6 +674,9 @@ ibus_m17n_engine_process_key_event (IBus
-         (IBusM17NEngineClass *) G_OBJECT_GET_CLASS (m17n);
-     guint original_keyval = keyval;
- 
-+    if (!m17n->has_focus)
-+        return FALSE;
-+
-     if (modifiers & IBUS_RELEASE_MASK)
-         return FALSE;
- 
-@@ -704,6 +714,7 @@ ibus_m17n_engine_focus_in (IBusEngine *e
- 
-     ibus_engine_register_properties (engine, m17n->prop_list);
-     ibus_m17n_engine_process_key (m17n, Minput_focus_in);
-+    m17n->has_focus = TRUE;
- 
-     parent_class->focus_in (engine);
- }
-@@ -717,6 +728,7 @@ ibus_m17n_engine_focus_out (IBusEngine *
-        properly, we just reset the IC instead of passing Mfocus_out to
-        m17n-lib. */
-     minput_reset_ic (m17n->context);
-+    m17n->has_focus = FALSE;
- 
-     parent_class->focus_out (engine);
- }
-@@ -812,6 +824,29 @@ ibus_m17n_engine_property_activate (IBus
- }
- 
- static void
-+ibus_m17n_engine_set_content_type (IBusEngine      *engine,
-+                                   IBusInputPurpose purpose,
-+                                   IBusInputHints   hints)
-+{
-+    IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
-+
-+    /* For password and PIN input, disable key processing by emulating
-+       'focus-out'.  */
-+    switch (purpose) {
-+    case IBUS_INPUT_PURPOSE_PASSWORD:
-+    case IBUS_INPUT_PURPOSE_PIN:
-+        ibus_m17n_engine_process_key (m17n, Minput_focus_out);
-+        m17n->has_focus = FALSE;
-+        break;
-+
-+    default:
-+        ibus_m17n_engine_process_key (m17n, Minput_focus_in);
-+        m17n->has_focus = TRUE;
-+        break;
-+    }
-+}
-+
-+static void
- ibus_m17n_engine_update_lookup_table (IBusM17NEngine *m17n)
- {
-     ibus_lookup_table_clear (m17n->table);

ibus-m17n-fix-data-location.patch

@@ -1,25 +0,0 @@
-From b0e03bac1f3b420ac1b7ac76d6008dd4ed942cbf Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-Date: Mon, 13 May 2013 15:45:33 +0900
-Subject: [PATCH] Fix ibus-m17n-preferences.ui location
-
----
- src/setup.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/setup.c b/src/setup.c
-index 513fabf..4de8fb1 100644
---- a/src/setup.c
-+++ b/src/setup.c
-@@ -570,7 +570,7 @@ setup_dialog_new (IBusConfig *config,
- 
-     error = NULL;
-     if (gtk_builder_add_from_file (builder,
--                                   PKGDATADIR "setup/ibus-m17n-preferences.ui",
-+                                   PKGDATADIR "/setup/ibus-m17n-preferences.ui",
-                                    &error) == 0) {
-         g_warning ("can't read ibus-m17n-preferences.ui: %s",
-                    error->message);
--- 
-1.8.1.4
-

ibus-m17n-fix-preedit-color.patch

@@ -1,29 +0,0 @@
-From e5c742c56abaadaa5d5a018c0d9004bf2d0a100c Mon Sep 17 00:00:00 2001
-From: Mike FABIAN <mfabian@redhat.com>
-Date: Mon, 12 Aug 2013 18:51:59 +0200
-Subject: [PATCH] engine: fix preedit background colour and underlining
-
-BUG=rhbz#995842
-
-Review URL: https://codereview.appspot.com/12688049
-Patch from Mike FABIAN <mfabian@redhat.com>.
----
- src/engine.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/engine.c b/src/engine.c
-index bcc1a71..ca70464 100644
---- a/src/engine.c
-+++ b/src/engine.c
-@@ -282,7 +282,7 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
-                                         "preedit_underline",
-                                         G_VARIANT_TYPE_INT32);
-         if (value != NULL) {
--            klass->preedit_background = g_variant_get_int32 (value);
-+            klass->preedit_underline = g_variant_get_int32 (value);
-             g_variant_unref (value);
-         }
- 
--- 
-1.8.3.1
-

ibus-m17n-fix-preferences-ui.patch

@@ -1,24 +0,0 @@
-From 1a497768dfb15c18865154183296087ec07d6a95 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-Date: Tue, 16 Sep 2014 11:28:04 +0900
-Subject: [PATCH] setup: Don't use removed "tab_vborder" property
-
----
- src/ibus-m17n-preferences.ui | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/ibus-m17n-preferences.ui b/src/ibus-m17n-preferences.ui
-index e85fb15..19d3b47 100644
---- a/src/ibus-m17n-preferences.ui
-+++ b/src/ibus-m17n-preferences.ui
-@@ -98,7 +98,6 @@
-           <object class="GtkNotebook" id="pages">
-             <property name="visible">True</property>
-             <property name="can_focus">True</property>
--            <property name="tab_vborder">3</property>
-             <child>
-               <object class="GtkAlignment" id="pageGeneral">
-                 <property name="visible">True</property>
--- 
-1.9.3
-

ibus-m17n-gettext-0.19.patch

@@ -1,90 +0,0 @@
-From 109acb63611f5fbd994aa56cd0b4a9b1b2eb178e Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-Date: Thu, 5 Jun 2014 12:17:36 +0900
-Subject: [PATCH] build: Switch from intltool to gettext-0.19
-
----
- configure.ac                      |  3 +--
- po/POTFILES.in                    |  2 +-
- src/Makefile.am                   | 19 ++++++++++++++-----
- src/ibus-setup-m17n.desktop.in.in |  4 ++--
- 4 files changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 30d44ff..dab9354 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,7 +48,6 @@ AM_PROG_CC_C_O
- AC_PROG_CXX
- AC_ISC_POSIX
- AC_HEADER_STDC
--IT_PROG_INTLTOOL([0.35.0])
- AM_PROG_LIBTOOL
- 
- # check ibus
-@@ -104,7 +103,7 @@ AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the read-only architecture-independent data directory.])
- 
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION(0.16.1)
-+AM_GNU_GETTEXT_VERSION([0.19])
- 
- 
- # OUTPUT files
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index bb3bd6e..4f81b75 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -1,5 +1,5 @@
- src/engine.c
- src/m17nutil.c
- src/main.c
--[type: gettext/glade]src/ibus-m17n-preferences.ui
-+src/ibus-m17n-preferences.ui
- src/ibus-setup-m17n.desktop.in.in
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 68ec953..c23e680 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -131,11 +131,20 @@ m17n.xml: m17n.xml.in
- 
- desktop_in_in_files = ibus-setup-m17n.desktop.in.in
- desktop_in_files = $(desktop_in_in_files:.in.in=.in)
-+desktop_files = $(desktop_in_files:.desktop.in=.desktop)
- 
--$(desktop_in_files): %.desktop.in: %.desktop.in.in Makefile
--	$(AM_V_GEN) $(edit) $< > $@.tmp && mv $@.tmp $@
-+$(desktop_in_files):
-+	$(AM_V_GEN) $(MSGFMT) --desktop --template $@.in -o $@-t \
-+	  -d $(top_srcdir)/po && mv $@-t $@
- 
--desktopdir=$(datadir)/applications
--desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-+$(desktop_files):
-+	@rm -f $@
-+	$(AM_V_GEN) srcdir=''; \
-+	  test -f ./$@.in || srcdir=$(srcdir)/; \
-+	  $(edit) $${srcdir}$@.in >$@-t && mv $@-t $@
- 
--@INTLTOOL_DESKTOP_RULE@
-+ibus-setup-m17n.desktop.in: ibus-setup-m17n.desktop.in.in
-+ibus-setup-m17n.desktop: ibus-setup-m17n.desktop.in
-+
-+desktopdir=$(datadir)/applications
-+desktop_DATA = $(desktop_files)
-diff --git a/src/ibus-setup-m17n.desktop.in.in b/src/ibus-setup-m17n.desktop.in.in
-index a380cb3..110fcfb 100644
---- a/src/ibus-setup-m17n.desktop.in.in
-+++ b/src/ibus-setup-m17n.desktop.in.in
-@@ -1,6 +1,6 @@
- [Desktop Entry]
--_Name=IBus M17N Setup
--_Comment=Set up IBus M17N engine
-+Name=IBus M17N Setup
-+Comment=Set up IBus M17N engine
- Exec=@libexecdir@/ibus-setup-m17n
- NoDisplay=true
- Type=Application
--- 
-1.9.0
-

ibus-m17n-hide-title-status.patch

@@ -9,9 +9,9 @@ Subject: [PATCH 2/4] Hide status from the panel if status == title.
 
 Index: ibus-m17n-1.3.4/src/engine.c
 ===================================================================
---- ibus-m17n-1.3.4.orig/src/engine.c
+--- ibus-m17n-1.4.0.orig/src/engine.c	2018-10-23 15:32:43.000000000 +0200
-+++ ibus-m17n-1.3.4/src/engine.c
++++ ibus-m17n-1.4.0/src/engine.c	2018-10-24 08:35:49.463479480 +0200
-@@ -38,6 +38,7 @@ struct _IBusM17NEngineClass {
+@@ -41,6 +41,7 @@
      gint lookup_table_orientation;
      gboolean use_us_layout;
  
@@ -19,10 +19,10 @@ Index: ibus-m17n-1.3.4/src/engine.c
      MInputMethod *im;
  };
  
-@@ -233,6 +234,10 @@ ibus_m17n_engine_class_init (IBusM17NEng
+@@ -236,6 +237,10 @@
-     }
+         "org.freedesktop.ibus.engine.m17n",
-     engine_name = g_strdup_printf ("m17n:%s:%s", lang, name);
+         g_strdup_printf ("/org/freedesktop/ibus/engine/m17n/%s/%s/",
-     klass->config_section = g_strdup_printf ("engine/M17N/%s/%s", lang, name);
+                          lang, name));
 +    MPlist *l = minput_get_title_icon (msymbol (lang), msymbol (name));
 +    if (l && mplist_key (l) == Mtext) {
 +        klass->title = ibus_m17n_mtext_to_utf8 (mplist_value (l));
@@ -30,7 +30,7 @@ Index: ibus-m17n-1.3.4/src/engine.c
      g_free (lang);
      g_free (name);
  
-@@ -924,8 +929,9 @@ ibus_m17n_engine_callback (MInputContext
+@@ -961,8 +966,9 @@
      else if (command == Minput_status_draw) {
          gchar *status;
          status = ibus_m17n_mtext_to_utf8 (m17n->context->status);

ibus-m17n.spec

@@ -1,34 +1,24 @@
 %global require_ibus_version 1.4.0
 
 Name:       ibus-m17n
-Version:    1.3.4
+Version:    1.4.4
-Release:    26%{?dist}
+Release:    3%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 URL:        https://github.com/ibus/ibus-m17n
 Source0:    https://github.com/ibus/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
 # Upstreamed patches:
-Patch0:     ibus-m17n-HEAD.patch
-Patch1:     ibus-m17n-fix-data-location.patch
-Patch2:     ibus-m17n-fix-preedit-color.patch
-Patch3:     ibus-m17n-fix-preferences-ui.patch
-Patch4:	    ibus-m17n-content-type.patch
-
 
 # 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 gettext-0.19 instead of intltool
-Patch102:     ibus-m17n-gettext-0.19.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
 
-# The following BR is for autogen and not necessary when packging
-# released tarballs.
 BuildRequires:  gettext-devel >= 0.19
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -37,6 +27,8 @@ 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
@@ -48,78 +40,94 @@ the input table maps from m17n-db.
 %prep
 %setup -q
 
-%patch0 -p1 -b .HEAD
-%patch1 -p1 -b .fix-data-location
-%patch2 -p1 -b .fix-preedit-color
-%patch3 -p1 -b .fix-preferences-ui
-%patch4 -p1 -b .content-type
 %patch100 -p1 -b .xkb-options
 %patch101 -p1 -b .hide-title-status
-%patch102 -p1 -b .gettext-0.19
 %patch103 -p1 -b .enable-ar-kbd
 
 
 %build
-NOCONFIGURE=1 ./autogen.sh
 %configure --disable-static --with-gtk=3.0
 # make -C po update-gmo
-make %{?_smp_mflags}
+%{make_build}
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install
+%{make_install}
-
-# Register as an AppStream component to be visible in the software center
-#
-# NOTE: It would be *awesome* if this file was maintained by the upstream
-# project, translated and installed into the right place during `make install`.
-#
-# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-#
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/m17n.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="inputmethod">
-  <id>m17n.xml</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>Multilingualization</name>
-  <summary>Multilingualization input method</summary>
-  <description>
-    <p>
-      The multilingualization input method allows entering many languages using the
-      tables from the m17n library.
-    </p>
-    <p>
-      Input methods are typing systems allowing users to input complex languages.
-      They are necessary because these contain too many characters to simply be laid
-      out on a traditional keyboard.
-    </p>
-  </description>
-  <url type="homepage">https://github.com/ibus/ibus-m17n</url>
-  <compulsory_for_desktop>GNOME</compulsory_for_desktop>
-  <project_group>GNOME</project_group>
-  <developer_name>The GNOME Project</developer_name>
-  <url type="bugtracker">https://code.google.com/p/ibus/issues/list</url>
-  <url type="donation">http://www.gnome.org/friends/</url>
-  <url type="help">https://code.google.com/p/ibus/wiki/FAQ</url>
-  <update_contact><!-- upstream-contact_at_email.com --></update_contact>
-</component>
-EOF
-
-desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-m17n.desktop
 
 %find_lang %{name}
 
+%check
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
+desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-m17n.desktop
+make check
+
 %files -f %{name}.lang
 %doc AUTHORS README
 %license COPYING
-%{_datadir}/appdata/*.appdata.xml
+%{_datadir}/metainfo/m17n.appdata.xml
 %{_datadir}/ibus-m17n
 %{_libexecdir}/ibus-engine-m17n
 %{_libexecdir}/ibus-setup-m17n
 %{_datadir}/ibus/component/*
 %{_datadir}/applications/ibus-setup-m17n.desktop
+%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.m17n.gschema.xml
 
 %changelog
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.4-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.4-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Thu Jan 28 2021 Mike FABIAN <mfabian@redhat.com> - 1.4.4-1
+- Update to  1.4.4
+- Translation update from Weblate, zh_CN now 100% complete.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jun 20 2020 Mike FABIAN <mfabian@redhat.com> - 1.4.3-1
+- Update to  1.4.3
+- New translation: es (Spanish) 100%.
+
+* Sat Apr 18 2020 Parag Nemade <pnemade AT redhat DOT com> - 1.4.2-4
+- No need to call autogen.sh in %%prep section
+
+* Wed Mar 18 2020 Parag Nemade <pnemade AT redhat DOT com> - 1.4.2-3
+- Use make_build and make_install macros
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 20 2020 Mike FABIAN <mfabian@redhat.com> - 1.4.2-1
+- Update to  1.4.2
+- New translations: tr (Turkish) 100%, uk (Ukrainian) 100%,
+  id (Indonesian) 100%, ja_JP (Japanese) 100%.
+- Translation updates: zh_CN, pt_BR
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Oct 25 2018 Mike FABIAN <mfabian@redhat.com> - 1.4.1-1
+- Update to  1.4.1
+- Fix for google code issue 1781 in ibus-m17n for kk (Correct symbols for kk input methods)
+- Add German translations
+- Add m17n.appdata.xml
+
+* Tue Oct 23 2018 Mike FABIAN <mfabian@redhat.com> - 1.4.0-1
+- Update to  1.4.0
+- Migration from IBusConfig to GSettings
+- Remove patches which are included upstream now
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Jun 22 2018 Parag Nemade <pnemade AT fedoraproject DOT org> - 1.3.4-26
 - Fix the upstream URL and Source0 tags
 

plans/basic.fmf

@@ -0,0 +1,9 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt
+prepare:
+    how: shell
+    script:
+    - dnf config-manager --enable rhel-CRB --enable rhel-buildroot

sources

@@ -1 +1 @@
-SHA512 (ibus-m17n-1.3.4.tar.gz) = 9dbb5224fea377293a583e68598b36be4637698af0718c5117434d60b6a398bf94dc8cc2dbeef59c2d43bdab6f50e831bc60dd97112eed02105a3f2b9d55f026
+SHA512 (ibus-m17n-1.4.4.tar.gz) = df8be7ceaa2183ffb377e39f52b271f18825a8970f88972d0a43ed1fa2721d36bf564a20f89311541ffe19546441322fc568c4819e42e41bdff45ee137d6de80

tests/smoke/main.fmf

@@ -0,0 +1,18 @@
+test: ./runtest.sh
+framework: beakerlib
+require:
+  - gcc
+  - make
+  - gnome-common
+  - autoconf
+  - automake
+  - gettext-devel
+  - ibus
+  - ibus-devel
+  - gtk3-devel
+  - pkgconfig
+  - libtool
+  - m17n-lib-devel
+  - m17n-db
+  - ibus-m17n
+  - rpm-build

tests/smoke/runtest.sh

@@ -1,10 +1,186 @@
 #!/bin/bash
-cd ../source
+. /usr/share/beakerlib/beakerlib.sh || exit 1
 
-echo "---Start autogen.sh---"
+rlJournalStart
-NOCONFIGURE=1 ./autogen.sh
+    rlPhaseStartSetup
-echo "---End autogen.sh---"
+        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
-echo "--------------------"
+        rlRun "pushd $tmp"
+        rlFetchSrcForInstalled "ibus-m17n"
+        rlRun "rpm --define '_topdir $tmp' -i *src.rpm"
+        rlRun "mkdir BUILD" 0 "Creating BUILD directory"
+        rlRun "rpmbuild --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec"
+        rlRun "pushd BUILD/ibus-m17n*"
+        rlRun "set -o pipefail"
+        rlRun "NOCONFIGURE=1 ./autogen.sh"
+        rlRun "./configure --disable-static --with-gtk=3.0"
+        rlRun "make check"
+        rlAssertRpm "ibus"
+        rlAssertRpm "m17n-db"
+    rlPhaseEnd
 
-./configure --disable-static --with-gtk=3.0
+    rlPhaseStartTest
-make check
+        rlRun "ibus-daemon -v -r -d"
+        rlRun "sleep 5" 0 "Give ibus-daemon some time to start properly."
+        for name in \
+            am:sera \
+            ar:kbd \
+            ar:translit \
+            as:inscript \
+            as:inscript2 \
+            as:itrans \
+            as:phonetic \
+            ath:phonetic \
+            bla:phonetic \
+            bn:disha \
+            bn:inscript \
+            bn:inscript2 \
+            bn:itrans \
+            bn:probhat \
+            bo:ewts \
+            bo:tcrc \
+            bo:wylie \
+            brx:inscript2 \
+            cr:western \
+            da:post \
+            doi:inscript2 \
+            dv:phonetic \
+            eo:h-fundamente \
+            eo:h-sistemo \
+            eo:plena \
+            eo:q-sistemo \
+            eo:vi-sistemo \
+            eo:x-sistemo \
+            fa:isiri \
+            fr:azerty \
+            grc:mizuochi \
+            gu:inscript \
+            gu:inscript2 \
+            gu:itrans \
+            gu:phonetic \
+            hi:inscript \
+            hi:inscript2 \
+            hi:itrans \
+            hi:optitransv2 \
+            hi:phonetic \
+            hi:remington \
+            hi:typewriter \
+            hi:vedmata \
+            hu:rovas-post \
+            ii:phonetic \
+            iu:phonetic \
+            kk:arabic \
+            km:yannis \
+            kn:inscript \
+            kn:inscript2 \
+            kn:itrans \
+            kn:kgp \
+            kn:optitransv2 \
+            kn:typewriter \
+            kok:inscript2 \
+            ks:inscript \
+            ks:kbd \
+            lo:lrt \
+            mai:inscript \
+            mai:inscript2 \
+            ml:enhanced-inscript \
+            ml:inscript \
+            ml:inscript2 \
+            ml:itrans \
+            ml:mozhi \
+            ml:remington \
+            ml:swanalekha \
+            mni:inscript2-beng \
+            mni:inscript2-mtei \
+            mr:inscript \
+            mr:inscript2 \
+            mr:itrans \
+            mr:phonetic \
+            mr:remington \
+            mr:typewriter \
+            ne:inscript2 \
+            ne:rom \
+            ne:rom-translit \
+            ne:trad \
+            ne:trad-ttf \
+            nsk:phonetic \
+            oj:phonetic \
+            or:inscript \
+            or:inscript2 \
+            or:itrans \
+            or:phonetic \
+            pa:anmollipi \
+            pa:inscript \
+            pa:inscript2 \
+            pa:itrans \
+            pa:jhelum \
+            pa:phonetic \
+            ps:phonetic \
+            ru:phonetic \
+            ru:translit \
+            ru:yawerty \
+            sa:IAST \
+            sa:harvard-kyoto \
+            sa:inscript2 \
+            sa:itrans \
+            sat:inscript2-deva \
+            sat:inscript2-olck \
+            sd:inscript \
+            sd:inscript2 \
+            si:phonetic-dynamic \
+            si:samanala \
+            si:sayura \
+            si:singlish \
+            si:sumihiri \
+            si:transliteration \
+            si:wijesekera \
+            sv:post \
+            t:latn-post \
+            t:latn-pre \
+            t:latn1-pre \
+            t:lsymbol \
+            t:math-latex \
+            t:rfc1345 \
+            t:ssymbol \
+            t:syrc-phonetic \
+            t:unicode \
+            ta:inscript \
+            ta:inscript2 \
+            ta:itrans \
+            ta:lk-renganathan \
+            ta:phonetic \
+            ta:tamil99 \
+            ta:typewriter \
+            ta:vutam \
+            tai:sonla-kbd \
+            te:apple \
+            te:inscript \
+            te:inscript2 \
+            te:itrans \
+            te:pothana \
+            te:rts \
+            te:sarala \
+            th:kesmanee \
+            th:pattachote \
+            th:tis820 \
+            ur:phonetic \
+            vi:han \
+            vi:nomtelex \
+            vi:nomvni \
+            vi:tcvn \
+            vi:telex \
+            vi:viqr \
+            vi:vni \
+            yi:yivo
+        do
+            rlRun "/usr/libexec/ibus-engine-m17n --xml 2>/dev/null | grep '<name>m17n:${name}</name>'" \
+                0 "checking whether 'ibus-engine-m17n --xml' can list m17n:${name}:"
+            rlRun "ibus list-engine --name-only | grep 'm17n:${name}$'" \
+                0 "checking whether ibus can list m17n:${name}:"
+        done
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd; popd"
+        rlRun "rm -r $tmp" 0 "Remove tmp directory"
+    rlPhaseEnd
+rlJournalEnd

tests/tests.yml

@@ -1,26 +0,0 @@
----
-- hosts: localhost
-  tags:
-  - classic
-  roles:
-  - role: standard-test-source
- 
-- hosts: localhost
-  tags:
-  - classic
-  roles:
-  - role: standard-test-basic
-    tests:
-    - smoke
-    required_packages:
-    - gcc
-    - make
-    - gnome-common
-    - autoconf
-    - automake
-    - gettext-devel
-    - ibus-devel
-    - gtk3-devel
-    - pkgconfig
-    - libtool
-    - m17n-lib-devel