.gitignore

@@ -18,9 +18,3 @@
 /ibus-table-others-1.3.9.tar.gz
 /ibus-table-others-1.3.10.tar.gz
 /ibus-table-others-1.3.11.tar.gz
-/ibus-table-others-1.3.12.tar.gz
-/ibus-table-others-1.3.13.tar.gz
-/ibus-table-others-1.3.14.tar.gz
-/ibus-table-others-1.3.15.tar.gz
-/ibus-table-others-1.3.16.tar.gz
-/ibus-table-others-1.3.17.tar.gz

gating.yaml

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

ibus-table-others.spec

@@ -1,8 +1,10 @@
+%global cur_ver 1.3.10
+
 Name:       ibus-table-others
-Version:    1.3.17
+Version:    1.3.11
-Release:    5%{?dist}
+Release:    7%{?dist}
 Summary:    Various tables for IBus-Table
-License:    LGPL-2.1-or-later AND GPL-3.0-or-later AND WTFPL
+License:    GPLv3
 URL:        http://github.com/moebiuscurve/ibus-table-others
 Source0:    http://mfabian.fedorapeople.org/ibus-table-others/%{name}-%{version}.tar.gz
 BuildArch:  noarch
@@ -17,16 +19,14 @@ Latin-America, Europe, Southeast Asia, as well as math and other symbols
 
 %package -n ibus-table-code
 Requires:  ibus-table
-Summary:   Ibus-Tables for Latex, CNS11643 & Emoticons
+Summary:   Ibus-Tables for Latex, CNS11643 & Emoji
-License:   LGPL-2.1-or-later
 
 %description -n ibus-table-code
-The package contains ibus-tables for Latex, CNS11643, Emoticons.
+The package contains ibus-tables for Latex, CNS11643, Emoji. 
 
 %package -n ibus-table-cyrillic
 Requires:  ibus-table
 Summary:   Ibus-Tables for Cyrillic
-License:   LGPL-2.1-or-later
 
 %description -n ibus-table-cyrillic
 The Cyrillic rustrad & yawerty tables for IBus Table.
@@ -34,7 +34,6 @@ The Cyrillic rustrad & yawerty tables for IBus Table.
 %package -n ibus-table-latin
 Requires:  ibus-table
 Summary:   Ibus-Tables for Latin
-License:   LGPL-2.1-or-later AND GPL-3.0-or-later
 
 %description -n ibus-table-latin
 The Latin compose & ipa-x-sampa tables for Ibus-Table.
@@ -42,7 +41,6 @@ The Latin compose & ipa-x-sampa tables for Ibus-Table.
 %package -n ibus-table-translit
 Requires:  ibus-table
 Summary:   Ibus-Tables for Russian Translit
-License:   LGPL-2.1-or-later
 
 %description -n ibus-table-translit
 The Cyrillic translit & translit-ua tables for IBus-Table.
@@ -50,7 +48,6 @@ The Cyrillic translit & translit-ua tables for IBus-Table.
 %package -n ibus-table-tv
 Requires:  ibus-table
 Summary:   Ibus-Tables for Thai and Viqr (Vietnamese)
-License:   LGPL-2.1-or-later
 
 %description -n ibus-table-tv
 The Thai and Viqr (Vietnamese) tables for IBus-Table.
@@ -58,18 +55,10 @@ The Thai and Viqr (Vietnamese) tables for IBus-Table.
 %package -n ibus-table-mathwriter
 Requires:  ibus-table
 Summary:  Ibus-Tables for Unicode mathematics symbols
-License:  LGPL-2.1-or-later
 
 %description -n ibus-table-mathwriter
 The package contains table for writing Unicode mathematics symbols.
 
-%package -n ibus-table-mongol
-Requires:  ibus-table
-Summary:  Ibus-Tables for Mongol Script
-License:  WTFPL
-
-%description -n ibus-table-mongol
-The package contains a table for transliterating Latin Script to Mongol Script
 
 %prep
 %setup -q
@@ -84,7 +73,7 @@ make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install
 cd ${RPM_BUILD_ROOT}/%{_datadir}/ibus-table/tables/
 %{_bindir}/ibus-table-createdb -i -n cns11643.db
 %{_bindir}/ibus-table-createdb -i -n compose.db
-%{_bindir}/ibus-table-createdb -i -n emoticon-table.db
+%{_bindir}/ibus-table-createdb -i -n emoji-table.db
 %{_bindir}/ibus-table-createdb -i -n ipa-x-sampa.db
 %{_bindir}/ibus-table-createdb -i -n latex.db
 %{_bindir}/ibus-table-createdb -i -n rusle.db
@@ -104,20 +93,18 @@ cd ${RPM_BUILD_ROOT}/%{_datadir}/ibus-table/tables/
 # See http://www.freedesktop.org/software/appstream/docs/ for more details.
 #
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/emoticon-table.appdata.xml <<EOF
+cat > $RPM_BUILD_ROOT%{_datadir}/appdata/emoji-table.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="inputmethod">
-  <id>emoticon-table.db</id>
+  <id>emoji-table.db</id>
   <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
+  <name>Emoji</name>
-  <name>Emoticon</name>
+  <summary>Emoji input method</summary>
-  <summary>Emoticon input method</summary>
   <description>
     <p>
-      Emoticon is an input method that allows the user to enter pictorial representation
+      Emoji is an input method that allows the user to enter pictographs that are used
-      of a facial or other expressions using characters—usually punctuation marks, numbers,
+      like emoticons.
-      and letters—to express a person's feelings, mood, or reaction, without needing to describe it in detail.
+      Some emoji strings are specific to Japanese culture.
-      This emoticon input method is mainly for Chinese users.
     </p>
     <p>
       Input methods are typing systems allowing users to input complex languages.
@@ -125,11 +112,11 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/emoticon-table.appdata.xml <<EOF
       out on a traditional keyboard.
     </p>
   </description>
-  <url type="homepage">https://code.google.com/p/ibus-table-emoticon/</url>
+  <url type="homepage">https://code.google.com/p/ibus-table-emoji/</url>
   <screenshots>
     <!-- FIXME: Needs an official up to date screenshot -->
     <screenshot type="default">
-      <image>http://ibus-table-emoticon.googlecode.com/hg/screenshot.png</image>
+      <image>http://ibus-table-emoji.googlecode.com/hg/screenshot.png</image>
       <caption><!-- Describe this screenshot in less than ~10 words --></caption>
     </screenshot>
   </screenshots>  <url type="bugtracker">https://code.google.com/p/ibus/issues/list</url>
@@ -148,7 +135,6 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/ipa-x-sampa.appdata.xml <<EOF
 <component type="inputmethod">
   <id>ipa-x-sampa.db</id>
   <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0-or-later</project_license>
   <name>International Phonetic Alphabet</name>
   <summary>IPA X-SAMPA input method</summary>
   <description>
@@ -180,7 +166,6 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mathwriter-ibus.appdata.xml <<EOF
 <component type="inputmethod">
   <id>mathwriter-ibus.db</id>
   <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
   <name>Mathwriter</name>
   <summary>Math symbols input method</summary>
   <description>
@@ -199,42 +184,18 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mathwriter-ibus.appdata.xml <<EOF
   <update_contact><!-- upstream-contact_at_email.com --></update_contact>
 </component>
 EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mongol_bichig.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="inputmethod">
-  <id>mongol_bichig.db</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>WTFPL</project_license>
-  <name>Mongol Bichig</name>
-  <summary>Transliteration to Mongol Script</summary>
-  <description>
-    <p>
-      The input method is designed for transliterating Latin input to Mongol Script.
-    </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/mike-fabian/ibus-table-others</url>
-  <url type="bugtracker">https://code.google.com/p/ibus/issues/list</url>
-  <url type="help">https://code.google.com/p/ibus/wiki/FAQ</url>
-  <update_contact><!-- upstream-contact_at_email.com --></update_contact>
-</component>
-EOF
 
 %files
 %doc AUTHORS COPYING README
 
 %files -n ibus-table-code
-%{_datadir}/appdata/emoticon-table.appdata.xml
+%{_datadir}/appdata/emoji-table.appdata.xml
 %{_datadir}/ibus-table/tables/latex.db
 %{_datadir}/ibus-table/tables/cns11643.db
-%{_datadir}/ibus-table/tables/emoticon-table.db
+%{_datadir}/ibus-table/tables/emoji-table.db
 %{_datadir}/ibus-table/icons/latex.svg
 %{_datadir}/ibus-table/icons/cns11643.png
-%{_datadir}/ibus-table/icons/ibus-emoticon.svg
+%{_datadir}/ibus-table/icons/ibus-emoji.svg
 
 %files -n ibus-table-cyrillic
 %{_datadir}/ibus-table/tables/rusle.db
@@ -274,82 +235,16 @@ EOF
 %{_datadir}/ibus-table/tables/mathwriter-ibus.db
 %{_datadir}/ibus-table/icons/mathwriter.png
 
-%files -n ibus-table-mongol
-%{_datadir}/appdata/mongol_bichig.appdata.xml
-%{_datadir}/ibus-table/tables/mongol_bichig.db
-%{_datadir}/ibus-table/icons/mongol_bichig.svg
-
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.3.17-5
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.11-7
-- Bump release for October 2024 mass rebuild:
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Resolves: RHEL-64018
+  Related: rhbz#1991688
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.3.17-4
+* Tue May 25 2021 Mike FABIAN <mfabian@redhat.com> - 1.3.11-6
-- Bump release for June 2024 mass rebuild
+- Resolves: rhbz#1960563 (Add CI tests)
 
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.17-3
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.11-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.17-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Aug 09 2023 Mike FABIAN <mfabian@redhat.com> - 1.3.17-1
-- Update to latest upstream 1.3.17
-- Rename emoji-table to emoticon-table
-  Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/15
-- Remove useless m4/as-version.m4
-  Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/36
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.16-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 04 2023 Mike FABIAN <mfabian@redhat.com> - 1.3.16-1
-- Update to latest upstream 1.3.16
-- hu-old-hungarian-rovas: several improvements,
-  most of them suggested by Viktor Kovács <kov.h.vik@gmail.com>
-  Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/33
-  Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/34
-  Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/30
-  Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/31
-  Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/35
-  Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/32
-  Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/29
-
-* Wed Feb 22 2023 Mike FABIAN <mfabian@redhat.com> - 1.3.15-1
-- Update to latest upstream 1.3.15
-- Remove { and } from VALID_INPUT_CHARS in latex.txt
-- Add “Mongol bichig” to README
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Nov 26 2022 Mike FABIAN <mfabian@redhat.com> - 1.3.14-1
-- Update to latest upstream 1.3.14
-- Migrate license tags to SPDX
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Apr 25 2022 Mike FABIAN <mfabian@redhat.com> - 1.3.13-1
-- \langle and \rangle were previously U+2329, U+232A from Miscellaneous Technical.
-  Changing them to U+27E8, U+27E9 from Miscellaneous Mathematical Symbols-A makes
-  more sense and lets us also add the double angle brackets U+27EA, U+27EB.
-  Patch by Jonathan Chan.
-  (Resolves: https://github.com/moebiuscurve/ibus-table-others/pull/24)
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul 14 2021 Mike FABIAN <mfabian@redhat.com> - 1.3.12-1
-- update to latest upstream 1.3.12
-- Integrate traditional Mongolian (mongol_bichig.txt) table
-  (Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/23)
-- improvements in the latex.txt table
-  (https://github.com/moebiuscurve/ibus-table-others/pull/22)
-- improvements in the mathwriter-ibus.txt table
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

plans/basic.fmf

@@ -3,3 +3,7 @@ discover:
     how: fmf
 execute:
     how: tmt
+prepare:
+    how: shell
+    script:
+    - dnf config-manager --enable rhel-CRB --enable rhel-buildroot

sources

@@ -1 +1 @@
-SHA512 (ibus-table-others-1.3.17.tar.gz) = 6b1c58693954fa7ebee941f674b24c0c25e3146cbdf0539816b2348c4c2e316cdc4aa173fa2f56a928b052f42d7ca2212dc8c849e49146c0b7b4758a15470ec3
+SHA512 (ibus-table-others-1.3.11.tar.gz) = bfa17338e3a6a3e392bb3e5e5736af9bfa5584a897aea4ca72aec0df2c84dc94a0737f8fb87ced382e6acac3f8169ed2aef93a2f94330a4829048d009cb96ee0

tests/main.fmf

@@ -4,11 +4,9 @@ duration: 10m
 require:
   - ibus
   - ibus-table
-  - ibus-table-others
   - ibus-table-code
   - ibus-table-cyrillic
   - ibus-table-latin
   - ibus-table-translit
   - ibus-table-tv
   - ibus-table-mathwriter
-  - ibus-table-mongol

tests/runtest.sh

@@ -7,24 +7,20 @@ rlJournalStart
         rlRun "pushd $tmp"
         rlAssertRpm "ibus"
         rlAssertRpm "ibus-table"
-        rlAssertRpm "ibus-table-others"
         rlAssertRpm "ibus-table-code"
         rlAssertRpm "ibus-table-cyrillic"
         rlAssertRpm "ibus-table-latin"
         rlAssertRpm "ibus-table-translit"
         rlAssertRpm "ibus-table-tv"
         rlAssertRpm "ibus-table-mathwriter"
-        rlAssertRpm "ibus-table-mongol"
     rlPhaseEnd
 
     rlPhaseStartTest
-        # The -s option and & is important, when using the -d option
+        rlRun "ibus-daemon -v -r -d"
-        # in this test environment the error “Can't connect to IBus.” occurs.
-        rlRun -t -l "ibus-daemon -v -r -s &"
         rlRun "sleep 5" 0 "Give ibus-daemon some time to start properly."
         for name in \
             cns11643 \
-            emoticon-table \
+            emoji-table \
             latex \
             rusle \
             rustrad \
@@ -38,13 +34,12 @@ rlJournalStart
             thai \
             viqr \
             vni \
-            mathwriter-ibus \
+            mathwriter-ibus
-            mongol_bichig
         do
-            rlRun -t -l "/usr/libexec/ibus-engine-table --xml 2>/dev/null | grep '<name>table:${name}</name>'" \
+            rlRun "/usr/libexec/ibus-engine-table --xml 2>/dev/null | grep '<name>table:${name}</name>'" \
             0 "checking whether 'ibus-engine-table --xml' can list table:${name}:"
 
-            rlRun -t -l "ibus list-engine --name-only | grep 'table:${name}$'" \
+            rlRun "ibus list-engine --name-only | grep 'table:${name}$'" \
                 0 "checking whether ibus can list table:${name}:"
         done
     rlPhaseEnd