From 691fe46aad564221eefb154423ac827e11a58d54 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Wed, 9 Aug 2023 12:39:50 +0200
Subject: [PATCH] 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
---
 .gitignore             |  1 +
 ibus-table-others.spec | 42 +++++++++++++++++++++++++-----------------
 sources                |  2 +-
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7d4462e..152e10a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /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
diff --git a/ibus-table-others.spec b/ibus-table-others.spec
index b85f6ef..c4f05ce 100644
--- a/ibus-table-others.spec
+++ b/ibus-table-others.spec
@@ -1,6 +1,6 @@
 Name:       ibus-table-others
-Version:    1.3.16
-Release:    2%{?dist}
+Version:    1.3.17
+Release:    1%{?dist}
 Summary:    Various tables for IBus-Table
 License:    LGPL-2.1-or-later AND GPL-3.0-or-later AND WTFPL
 URL:        http://github.com/moebiuscurve/ibus-table-others
@@ -17,11 +17,11 @@ 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 & Emoji
+Summary:   Ibus-Tables for Latex, CNS11643 & Emoticons
 License:   LGPL-2.1-or-later
 
 %description -n ibus-table-code
-The package contains ibus-tables for Latex, CNS11643, Emoji. 
+The package contains ibus-tables for Latex, CNS11643, Emoticons.
 
 %package -n ibus-table-cyrillic
 Requires:  ibus-table
@@ -84,7 +84,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 emoji-table.db
+%{_bindir}/ibus-table-createdb -i -n emoticon-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,19 +104,20 @@ 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/emoji-table.appdata.xml <<EOF
+cat > $RPM_BUILD_ROOT%{_datadir}/appdata/emoticon-table.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="inputmethod">
-  <id>emoji-table.db</id>
+  <id>emoticon-table.db</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.1-or-later</project_license>
-  <name>Emoji</name>
-  <summary>Emoji input method</summary>
+  <name>Emoticon</name>
+  <summary>Emoticon input method</summary>
   <description>
     <p>
-      Emoji is an input method that allows the user to enter pictographs that are used
-      like emoticons.
-      Some emoji strings are specific to Japanese culture.
+      Emoticon is an input method that allows the user to enter pictorial representation
+      of a facial or other expressions using characters—usually punctuation marks, numbers,
+      and letters—to express a person's feelings, mood, or reaction, without needing to describe it in detail.
+      This emoticon input method is mainly for Chinese users.
     </p>
     <p>
       Input methods are typing systems allowing users to input complex languages.
@@ -124,11 +125,11 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/emoji-table.appdata.xml <<EOF
       out on a traditional keyboard.
     </p>
   </description>
-  <url type="homepage">https://code.google.com/p/ibus-table-emoji/</url>
+  <url type="homepage">https://code.google.com/p/ibus-table-emoticon/</url>
   <screenshots>
     <!-- FIXME: Needs an official up to date screenshot -->
     <screenshot type="default">
-      <image>http://ibus-table-emoji.googlecode.com/hg/screenshot.png</image>
+      <image>http://ibus-table-emoticon.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>
@@ -227,13 +228,13 @@ EOF
 %doc AUTHORS COPYING README
 
 %files -n ibus-table-code
-%{_datadir}/appdata/emoji-table.appdata.xml
+%{_datadir}/appdata/emoticon-table.appdata.xml
 %{_datadir}/ibus-table/tables/latex.db
 %{_datadir}/ibus-table/tables/cns11643.db
-%{_datadir}/ibus-table/tables/emoji-table.db
+%{_datadir}/ibus-table/tables/emoticon-table.db
 %{_datadir}/ibus-table/icons/latex.svg
 %{_datadir}/ibus-table/icons/cns11643.png
-%{_datadir}/ibus-table/icons/ibus-emoji.svg
+%{_datadir}/ibus-table/icons/ibus-emoticon.svg
 
 %files -n ibus-table-cyrillic
 %{_datadir}/ibus-table/tables/rusle.db
@@ -279,6 +280,13 @@ EOF
 %{_datadir}/ibus-table/icons/mongol_bichig.svg
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index d4e6ae4..fafd716 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ibus-table-others-1.3.16.tar.gz) = 661cdac2c66408503b021a1c960ccc0b009f0adc418573d21c8c55447feb245fe361e5f6d48e77bea2168051bbe06b50ca9410d447fa2be1ea085128b2a06998
+SHA512 (ibus-table-others-1.3.17.tar.gz) = 6b1c58693954fa7ebee941f674b24c0c25e3146cbdf0539816b2348c4c2e316cdc4aa173fa2f56a928b052f42d7ca2212dc8c849e49146c0b7b4758a15470ec3