4 changed files with 139 additions and 365 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/ibus-table-chinese-1.8.3.tar.gz
+SOURCES/ibus-table-chinese-1.8.12.tar.gz
--- a/.ibus-table-chinese.metadata
+++ b/.ibus-table-chinese.metadata
@ -1 +1 @@
-34e254febe9609c8a65a08afe11b9d1b997972b2 SOURCES/ibus-table-chinese-1.8.3.tar.gz
+88589ec0e5e3c079e556be2b38cb59b75a2cf4ef SOURCES/ibus-table-chinese-1.8.12.tar.gz
--- a/SOURCES/no-cmake-fedora.patch
+++ b/SOURCES/no-cmake-fedora.patch
@ -1,199 +0,0 @@
-From 11f6bb926b5039c99869c3056449560524029e8d Mon Sep 17 00:00:00 2001
-From: Mike FABIAN <mfabian@redhat.com>
-Date: Mon, 2 Nov 2020 19:50:01 +0100
-Subject: [PATCH] Simplify CMakeLists.txt to avoid requiring cmake-fedora
-
---
- CMakeLists.txt        | 143 +++---------------------------------------
- tables/CMakeLists.txt |   2 +-
- 2 files changed, 9 insertions(+), 136 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bc10507..9113fba 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,104 +1,26 @@
- cmake_minimum_required(VERSION 2.6.2)
- 
-# Included scripts do automatic cmake_policy PUSH and POP.
-# OLD: CMake policy in included script will affect the invoker.
-CMAKE_POLICY(SET CMP0011 OLD)
-
- # Default CMAKE_INSTALL_PREFIX should be set before PROJECT()
- SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install dir prefix")
- 
-# Whether to build on fedora
-SET(CMAKE_FEDORA_ENABLE_FEDORA_BUILD "1" CACHE STRING "Enable fedora build")
-
-# Message level INFO1 (5)
-SET(MANAGE_MESSAGE_LEVEL 5 CACHE STRING "Message (Verbose) Level")
-
- ####################################################################
- # Project specific information
- #
- PROJECT(ibus-table-chinese NONE)
- SET(PRJ_SUMMARY "Chinese input tables for IBus")
- 
-SET(SUMMARY_TRANSLATIONS
-    "zh_CN" "中文码表输入法"
-    "zh_TW" "中文碼表輸入法"
-    )
-
- SET(PRJ_DESCRIPTION
- "ibus-table-chinese is provides the infrastructure for Chinese input methods.
- Input tables themselves are in subpackages."
-     )
- 
-SET(DESCRIPTION_TRANSLATIONS
-    "zh_TW" "ibus-table-chinese 提供了中文碼表輸入法的基礎架構。
-    輸入法本身則在子套件裡。"
-    )
-
-SET(AUTHORS "Yuwei Yu, Caius 'kaio' Chance, Ding-Yi Chen")
-SET(MAINTAINER "Ding-Yi Chen <dchen@redhat.com>")
-SET(VENDOR "Red Hat, Inc")
-SET(LICENSE "GPLv3+")
-SET(PRJ_GROUP "System Environment/Libraries")
-SET(BUILD_ARCH "noarch")
-SET(RPM_SPEC_URL "http://code.google.com/p/ibus/")
-SET(RPM_SPEC_SOURCES "https://fedorahosted.org/releases/c/m/%{name}/%{name}-%{version}-Source.tar.gz")
-
-####################################################################
-# Includes
-#
-LIST(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/Modules)
-
-# Create a link if Modules/ does not exists
-IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake-fedora/Modules)
-    IF(NOT EXISTS ${CMAKE_SOURCE_DIR}/Modules)
-	EXECUTE_PROCESS(COMMAND ln -s ${CMAKE_SOURCE_DIR}/cmake-fedora/Modules .)
-    ENDIF(NOT EXISTS ${CMAKE_SOURCE_DIR}/Modules)
-ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake-fedora/Modules)
-
-# Use standard FHS if Fedora build is not enabled
-IF(NOT CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
-    IF(CMAKE_SYSTEM_PROCESSOR MATCHES "64")
-	SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib64" CACHE PATH "Library dir")
-    ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "64")
-	SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Library dir")
-    ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "64")
-    SET(LIBEXEC_DIR "${LIB_DIR}" CACHE PATH "LIBEXEC dir")
-ENDIF(NOT CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
-
-INCLUDE(ManageEnvironmentCommon RESULT_VARIABLE MANAGE_ENVIRONMENT_PATH)
-IF(MANAGE_ENVIRONMENT_PATH STREQUAL "NOTFOUND")
-MESSAGE(FATAL_ERROR "ManageEnvironmentCommon is not found in CMAKE_MODULE_PATH,
-    please do the either:
-    1) git submodule init; git submodule update
-    2) or install cmake-fedora
-    3) or wget -P SOURCES https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-modules-only-latest.tar.gz
-    tar zxvf SOURCES/cmake-fedora-modules-only-latest.tar.gz")
-ENDIF(MANAGE_ENVIRONMENT_PATH STREQUAL "NOTFOUND")
-
-INCLUDE(ManageEnvironment)
-INCLUDE(ManageVersion)
-RELEASE_NOTES_READ_FILE()
-INCLUDE(ManageArchive)
-INCLUDE(ManageFile)
-INCLUDE(ManageSourceVersionControl)
-INCLUDE(ManageTarget)
-INCLUDE(ManageTranslation)
-INCLUDE(ManageUninstall)
-ENABLE_TESTING()
-
-####################################################################
-# Dependencies
-#
-
-INCLUDE(ManageDependency)
-## Requires
-MANAGE_DEPENDENCY(REQUIRES IBUS-TABLE VER "1.2.0" REQUIRED)
-
-## Build Requires
-MANAGE_DEPENDENCY(BUILD_REQUIRES CMAKE VER "2.6.2" REQUIRED)
-MANAGE_DEPENDENCY(BUILD_REQUIRES IBUS-TABLE VER "1.5.0" REQUIRED)
-PRJ_INFO_CMAKE_APPEND(${PRJ_INFO_CMAKE} REQUIRES)
-PRJ_INFO_CMAKE_APPEND(${PRJ_INFO_CMAKE} BUILD_REQUIRES)
-+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "64")
-+    SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib64" CACHE PATH "Library dir")
-+ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "64")
-+    SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Library dir")
-+ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "64")
-+SET(LIBEXEC_DIR "${LIB_DIR}" CACHE PATH "LIBEXEC dir")
-+SET(DATA_DIR "/usr/share")
- 
- ####################################################################
- # Building
-@@ -108,55 +30,6 @@ ADD_SUBDIRECTORY(tables)
- ####################################################################
- # Installing
- #
-
-MANAGE_SOURCE_VERSION_CONTROL_GIT()
-
-+SET(PRJ_DOC_DIR "${DATA_DIR}/doc/ibus-table-chinese")
- INSTALL(FILES AUTHORS README ChangeLog COPYING DESTINATION ${PRJ_DOC_DIR})
- 
-####################################################################
-# Packing
-#
-
-## Pack Source 
-SET(SOURCE_ARCHIVE_DIR ${CMAKE_BINARY_DIR}/SOURCES CACHE PATH "Source Archive Dir")
-PACK_SOURCE_ARCHIVE("${SOURCE_ARCHIVE_DIR}"
-    GITIGNORE ${CMAKE_SOURCE_DIR}/.gitignore
-    )
-
-## Pack RPM
-IF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
-    SET(RPM_BUILD_SOURCES ${SOURCE_ARCHIVE_DIR})
-    INCLUDE(ManageRPM)
-    PACK_RPM(SPEC_IN "SPECS/project.spec.in")
-ENDIF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
-
-####################################################################
-# Hosting and Release
-#
-# Set to "True" to build against updates-candidate if possible.
-
-#INCLUDE(ManageUpload)
-#ADD_CUSTOM_TARGET(upload
-#    COMMENT "Uploading all files"
-#    )
-
-#MANAGE_UPLOAD_CMD(scp src UPLOAD_FILES ${SOURCE_ARCHIVE_FILE})
-#ADD_DEPENDENCIES(upload upload_src)
-
-INCLUDE(ManageRelease)
-IF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
-    INCLUDE(ManageReleaseFedora)
-    RELEASE_FEDORA(fedora el6)
-    # "Off" Warning is displayed if mock is not installed.
-    MANAGE_RELEASE(tag_push release_fedora)
-ELSE(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
-    MANAGE_RELEASE(tag_push)
-ENDIF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
-
-
-####################################################################
-# Test Suites.
-#
-#ADD_TEST("Test" test_cmd1)
-
-
-diff --git a/tables/CMakeLists.txt b/tables/CMakeLists.txt
-index 9f04605..6a5c8c1 100644
--- a/tables/CMakeLists.txt
-+++ b/tables/CMakeLists.txt
-@@ -98,7 +98,7 @@ MACRO(CONVERT_DB targetName)
- 	    LIST(APPEND _dependIcon "${CMAKE_SOURCE_DIR}/icons/${_tabName}.jpg")
- 	ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/icons/${_tabName}.png")
-     ENDFOREACH(_tabFile ${ARGN})
-    M_MSG(${M_INFO1} "[${targetName}] db files=${_dependDb}")
-+    MESSAGE("[${targetName}] db files=${_dependDb}")
- 
-     ADD_CUSTOM_TARGET(convert_${targetName}
- 	COMMENT "Building ${targetName} table(s)..."
-- 
-2.26.2
-
--- a/SPECS/ibus-table-chinese.spec
+++ b/SPECS/ibus-table-chinese.spec
@ -2,17 +2,16 @@
 %global ibus_tables_dir %{_datadir}/ibus-table/tables
 %global ibus_icons_dir %{_datadir}/ibus-table/icons
 Name:           ibus-table-chinese
-Version:        1.8.3
-Release:        10%{?dist}
+Version:        1.8.12
+Release:        6%{?dist}
 Summary:        Chinese input tables for IBus
 Summary(zh_CN): 中文码表输入法
 Summary(zh_TW): 中文碼表輸入法
-License:        GPLv3+
-URL:            https://github.com/definite/ibus-table-chinese
-Source0:        https://github.com/definite/ibus-table-chinese/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:         no-cmake-fedora.patch
+License:        GPL-3.0-or-later
+URL:            https://github.com/mike-fabian/ibus-table-chinese
+Source0:        https://github.com/mike-fabian/ibus-table-chinese/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz

-BuildRequires:  cmake >= 2.6.2
+BuildRequires:  cmake >= 3.0.0
 BuildRequires:  ibus-table-devel >= 1.10.0
 BuildRequires: make
 Requires:       ibus-table >= 1.10.0
@ -33,7 +32,7 @@ ibus-table-chinese 提供了中文碼表輸入法的基礎架構。
 Summary:       Array input methods
 Summary(zh_CN): 行列输入法
 Summary(zh_TW): 行列輸入法
-License:       Freely redistributable without restriction
+License:        LicenseRef-Fedora-UltraPermissive
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-array30 = %{version}-%{release}
 Obsoletes:      ibus-table-array30 < 1.3
@ -59,7 +58,7 @@ array30-big: 27489 characters + Unicode ExtB.
 Summary:       Cangjie based input methods
 Summary(zh_TW): 倉頡輸入法
 Summary(zh_CN): 仓颉输入法
-License:       Freely redistributable without restriction
+License:        LicenseRef-Fedora-UltraPermissive AND GPL-2.0-only
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-cangjie = %{version}-%{release}
 Obsoletes:      ibus-table-cangjie < 1.3
@ -75,7 +74,7 @@ Cangjie3, Canjie5, and Cangjie big tables.
 %package cantonese
 Summary:        Cantonese input methods
 Summary(zh_TW): 粵語輸入法
-License:       GPLv2 and GPLv3+ and Freely redistributable without restriction
+License:        GPL-2.0-only AND GPL-3.0-or-later AND MIT
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-cantonese = %{version}-%{release}
 Obsoletes:      ibus-table-cantonese < 1.3
@ -94,7 +93,7 @@ and jyutping.
 Summary:        Easy input method
 Summary(zh_CN): 轻松输入法
 Summary(zh_TW): 輕鬆輸入法
-License:        GPLv2
+License:        GPL-2.0-only
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-easy = %{version}-%{release}
 Obsoletes:      ibus-table-easy < 1.3
@ -112,7 +111,7 @@ Easy phrase-wise input method.
 Summary: Erbi input method
 Summary(zh_CN): 二笔输入法
 Summary(zh_TW): 二筆輸入法
-License:       GPLv2+
+License:        GPL-2.0-or-later
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-erbi = %{version}-%{release}
 Obsoletes:      ibus-table-erbi < 1.3
@ -136,7 +135,7 @@ and  Erbi Qin-Song (erbi-qs)
 Summary:       Quick-to-learn input methods
 Summary(zh_CN): 速成输入法
 Summary(zh_TW): 速成輸入法
-License:       Freely redistributable without restriction
+License:        LicenseRef-Fedora-UltraPermissive
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-quick = %{version}-%{release}
 Obsoletes:      ibus-table-quick < 1.3
@ -147,8 +146,7 @@ but only need Canjie's first and last word-root
 to form a character.

 Includes:
-Quick3, Quick5 and Quick-Classic,
-and Smart Cangjie 6.
+Quick3, Quick5 and Quick-Classic.

 %description -l zh_TW quick
 速成輸入法，又稱簡易輸入法，為倉頡輸入法之簡化版本。
@ -161,7 +159,7 @@ and Smart Cangjie 6.
 Summary: Smart Cangjie
 Summary(zh_CN): 快速仓颉输入法
 Summary(zh_TW): 快速倉頡輸入法
-License:       GPLv3+
+License:        GPL-3.0-or-later
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-cangjie = %{version}-%{release}
 Obsoletes:      ibus-table-cangjie < 1.3
@ -198,7 +196,7 @@ This package includes the Smart Cangjie 6.
 Summary: Stroke 5 input method
 Summary(zh_CN): 笔顺五码输入法
 Summary(zh_TW): 筆順五碼輸入法
-License:        GPLv3+
+License:        GPL-3.0-or-later
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-stroke5 = %{version}-%{release}
 Obsoletes:      ibus-table-stroke5 < 1.3
@ -217,7 +215,7 @@ Stroke5 input method.
 Summary: Wu pronunciation input method
 Summary(zh_CN): 上海吳语注音输入法
 Summary(zh_TW): 上海吳語注音輸入法
-License:        GPLv2+
+License:        GPL-2.0-or-later
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-wu = %{version}-%{release}
 Obsoletes:      ibus-table-wu < 1.3
@ -239,7 +237,7 @@ URL: http://input.foruto.com/wu/
 Summary: Haifeng Wubi input method
 Summary(zh_CN): 海峰五笔输入法
 Summary(zh_TW): 海峰五筆輸入法
-License:        BSD
+License:        0BSD
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-wubi = %{version}-%{release}
 Obsoletes:      ibus-table-wubi < 1.3
@ -258,7 +256,7 @@ Haifeng Wubi 86.
 Summary: Jidian Wubi 86 input method, JiShuang 6.0
 Summary(zh_CN): 极点五笔86输入法 极爽词库 6.0
 Summary(zh_TW): 極點五筆86輸入法 極爽詞庫 6.0
-License:       Freely redistributable without restriction
+License:        LicenseRef-Fedora-UltraPermissive
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-wubi = %{version}-%{release}
 Obsoletes:      ibus-table-wubi < 1.3
@ -277,7 +275,7 @@ Wubi 86.
 Summary: YongMa input method
 Summary(zh_CN): 永码输入法
 Summary(zh_TW): 永碼輸入法
-License:        GPLv3
+License:        GPL-3.0-only
 Requires:       %{name} = %{version}-%{release}
 Provides:       ibus-table-yong = %{version}-%{release}
 Obsoletes:      ibus-table-yong < 1.3
@ -293,7 +291,7 @@ YongMa input method.

 %package cantonyale
 Summary:        Cantonese input method based on yale romanization
-License:        GPLv2
+License:        GPL-2.0-only
 Requires:       %{name} = %{version}-%{release}

 %description cantonyale
@ -301,144 +299,18 @@ Cantonese input method based on yale romanization

 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .no-cmake-fedora
-%{__sed} -i 's/\r//' tables/wubi-haifeng/COPYING

 %build
-# $RPM_OPT_FLAGS should be loaded from cmake macro.
-%cmake -B .
-%__make VERBOSE=1  %{?_smp_mflags}
+cmake -B build-noarch -S .
+make -C build-noarch

 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make -C build-noarch install DESTDIR=%{buildroot}

 # Register as AppStream components to be visible in the software center
-#
-# NOTE: It would be *awesome* if these files were 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/stroke5.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="inputmethod">
-  <id>stroke5.db</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>Stroke 5</name>
-  <summary>Chinese input method</summary>
-  <description>
-    <p>
-      Stroke 5 is a very simple stroke-based Chinese input method.
-      It was designed specifically for people with limited hand mobility or computer
-      literacy, like the elderly or disabled.
-    </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://code.google.com/p/ibus/</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>
-  <languages>
-    <lang percentage="100">zh_CN</lang>
-    <lang percentage="100">zh_HK</lang>
-    <lang percentage="100">zh_SG</lang>
-    <lang percentage="100">zh_TW</lang>
-  </languages>
-  <update_contact><!-- upstream-contact_at_email.com --></update_contact>
-</component>
-EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/wubi-haifeng86.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="inputmethod">
-  <id>wubi-haifeng86.db</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>HaiFeng Wubi 86</name>
-  <summary>Simplified Chinese input method</summary>
-  <description>
-    <p>
-      The HaiFeng Wubi 86 input method is designed for entering Simplified Chinese text.
-    </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">http://code.google.com/p/ibus/</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>
-  <languages>
-    <lang percentage="100">zh_CN</lang>
-    <lang percentage="100">zh_HK</lang>
-    <lang percentage="100">zh_SG</lang>
-    <lang percentage="100">zh_TW</lang>
-  </languages>
-  <update_contact><!-- upstream-contact_at_email.com --></update_contact>
-</component>
-EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/wubi-jidian86.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="inputmethod">
-  <id>wubi-jidian86.db</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>Jidian Wubi 86</name>
-  <summary>Simplified Chinese input method</summary>
-  <description>
-    <p>
-      The Jidian Wubi 86 input method is designed for entering Simplified Chinese text.
-    </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">http://code.google.com/p/ibus/</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>
-  <languages>
-    <lang percentage="100">zh_CN</lang>
-    <lang percentage="100">zh_HK</lang>
-    <lang percentage="100">zh_SG</lang>
-    <lang percentage="100">zh_TW</lang>
-  </languages>
-  <update_contact><!-- upstream-contact_at_email.com --></update_contact>
-</component>
-EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/cantonyale.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="inputmethod">
-  <id>cantonyale.db</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>cantonyale</name>
-  <summary>Cantonese input method based on yale romanization</summary>
-  <description>
-    <p>
-      The cantonyale input method is designed to enter Chinese text using yale romanization.
-    </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">http://code.google.com/p/ibus/</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>
-  <languages>
-    <lang percentage="100">zh_CN</lang>
-    <lang percentage="100">zh_HK</lang>
-    <lang percentage="100">zh_SG</lang>
-    <lang percentage="100">zh_TW</lang>
-  </languages>
-  <update_contact><!-- upstream-contact_at_email.com --></update_contact>
-</component>
-EOF
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
+cp metainfo/*.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo

 # We install document using doc 
 rm -fr %{buildroot}%{_docdir}/*
@ -447,12 +319,14 @@ rm -fr %{buildroot}%{_docdir}/*
 %doc AUTHORS README ChangeLog COPYING

 %files array
+%{_datadir}/metainfo/ibus-table-chinese-array.appdata.xml
 %{ibus_icons_dir}/array30.*
 %{ibus_tables_dir}/array30.db
 %{ibus_icons_dir}/array30-big.*
 %{ibus_tables_dir}/array30-big.db

 %files cangjie
+%{_datadir}/metainfo/ibus-table-chinese-cangjie.appdata.xml
 %{ibus_icons_dir}/cangjie3.*
 %{ibus_tables_dir}/cangjie3.db
 %{ibus_icons_dir}/cangjie5.*
@ -461,6 +335,7 @@ rm -fr %{buildroot}%{_docdir}/*
 %{ibus_tables_dir}/cangjie-big.db

 %files cantonese
+%{_datadir}/metainfo/ibus-table-chinese-cantonese.appdata.xml
 %{ibus_icons_dir}/cantonese.*
 %{ibus_tables_dir}/cantonese.db
 %{ibus_icons_dir}/cantonhk.*
@ -469,16 +344,19 @@ rm -fr %{buildroot}%{_docdir}/*
 %{ibus_tables_dir}/jyutping.db

 %files easy
+%{_datadir}/metainfo/ibus-table-chinese-easy.appdata.xml
 %{ibus_icons_dir}/easy-big.*
 %{ibus_tables_dir}/easy-big.db

 %files erbi
+%{_datadir}/metainfo/ibus-table-chinese-erbi.appdata.xml
 %{ibus_icons_dir}/erbi.*
 %{ibus_tables_dir}/erbi.db
 %{ibus_icons_dir}/erbi-qs.*
 %{ibus_tables_dir}/erbi-qs.db

 %files quick
+%{_datadir}/metainfo/ibus-table-chinese-quick.appdata.xml
 %{ibus_icons_dir}/quick3.*
 %{ibus_tables_dir}/quick3.db
 %{ibus_icons_dir}/quick5.*
@ -487,49 +365,144 @@ rm -fr %{buildroot}%{_docdir}/*
 %{ibus_tables_dir}/quick-classic.db

 %files scj
+%{_datadir}/metainfo/ibus-table-chinese-scj.appdata.xml
 %{ibus_icons_dir}/scj6.*
 %{ibus_tables_dir}/scj6.db

 %files stroke5
-%{_datadir}/appdata/stroke5.appdata.xml
+%{_datadir}/metainfo/ibus-table-chinese-stroke5.appdata.xml
 %{ibus_icons_dir}/stroke5.*
 %{ibus_tables_dir}/stroke5.db

 %files wu
+%{_datadir}/metainfo/ibus-table-chinese-wu.appdata.xml
 %{ibus_icons_dir}/wu.*
 %{ibus_tables_dir}/wu.db

 %files wubi-haifeng
-%{_datadir}/appdata/wubi-haifeng86.appdata.xml
+%{_datadir}/metainfo/ibus-table-chinese-wubi-haifeng86.appdata.xml
 %doc tables/wubi-haifeng/COPYING tables/wubi-haifeng/README
 %{ibus_icons_dir}/wubi-haifeng86.*
 %{ibus_tables_dir}/wubi-haifeng86.db

 %files wubi-jidian
-%{_datadir}/appdata/wubi-jidian86.appdata.xml
+%{_datadir}/metainfo/ibus-table-chinese-wubi-jidian86.appdata.xml
 %{ibus_icons_dir}/wubi-jidian86.*
 %{ibus_tables_dir}/wubi-jidian86.db

 %files yong
+%{_datadir}/metainfo/ibus-table-chinese-yong.appdata.xml
 %{ibus_icons_dir}/yong.*
 %{ibus_tables_dir}/yong.db

 %files cantonyale
-%{_datadir}/appdata/cantonyale.appdata.xml
+%{_datadir}/metainfo/ibus-table-chinese-cantonyale.appdata.xml
 %{ibus_icons_dir}/cantonyale.*
 %{ibus_tables_dir}/cantonyale.db

 %changelog
-* Thu Feb 03 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.3-10
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.8.12-6
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.12-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Dec 12 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.12-1
+- Update to 1.8.12
+- appdata.xml files are now included upstream, remove from the .spec file
+- Migrate license tags to SPDX format
+
+* Sun Oct 30 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.11-1
+- Update to 1.8.11
+- Improve punctuation support in jyutping.txt, cantonese.txt, cantonhk.txt, cantonyale.txt
+  (Resolves: https://github.com/mike-fabian/ibus-table-chinese/issues/7)
+- Improve “improve_jyutping.py” to allow comments in the table
+- Update of jyutping.txt for Unicode 15.0.0 final release
+
+* Tue Oct 25 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.10-1
+- Update to 1.8.10
+- Improve punctuation support in cangjie5.txt, cangjie3.txt, cangjie-big.txt,
+  quick5.txt, quick3.txt, quick-classic.txt
+  (Resolves: https://github.com/kaio/ibus-table/issues/73)
+- Remove obsolete patch: Make-build-outside-of-the-source-tree-possible.patch
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jul 13 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.9-1
+- Update to 1.8.9
+- Add tones to Jyutping.txt table
+  (Resolves: https://github.com/mike-fabian/ibus-table-chinese/issues/6)
+  Tonal markers according to
+  https://github.com/rime/rime-cantonese/blob/main/README-en.md#tonal-markers
+  were added:
+  1. v: High level, e.g. siv → 詩; High level checked, e.g. sikv → 色
+  2. x: Medium rising, e.g. six → 史
+  3. q: Medium level, e.g. siq→ 試; Medium level checked, e.g. sekq → 錫
+  4. vv: Low falling, e.g. sivv → 時
+  5. xx: Low rising, e.g. sixx → 市
+  6. qq: Low level, e.g. siqq→ 事; Low level checked, e.g. sikqq → 食
+ 
+* Wed Feb 09 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.8-1
+- Update to 1.8.8
+- Add PINYIN_MODE = TRUE to cangjie-big.txt, quick-classic.txt, and erbi.txt
+- Make “Traditional Chinese only” the default for quick5
+- Improve the quick5.txt table in a similar way the cangjie5.txt
+  table was recently improved
+  (Resolves: https://github.com/mike-fabian/ibus-table-chinese/issues/4)
+- Build outside of the source tree
+  (Resolves: https://github.com/mike-fabian/ibus-table-chinese/issues/2)
+
+* Sat Jan 29 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.7-2
 - Don’t index the databases in the post install
- Resolves: rhbz#2047954

-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.3-9
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Jan 24 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.7-1
+- Update to 1.8.7
+- Make “Traditional Chinese only” the default for cangjie5
+  (Resolves: https://github.com/mike-fabian/ibus-table-chinese/issues/2)

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.3-8
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jan 18 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.6-1
+- Update to 1.8.6
+- Increase serial number of cangjie5.txt and erbi-qs.txt
+
+* Tue Jan 11 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.5-1
+- Update to 1.8.5
+- erbi-qs.txt: add table_extra tag for auxiliary code
+  (Resolves: https://github.com/definite/ibus-table-chinese/pull/18)
+
+* Mon Jan 10 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.4-1
+- Update to 1.8.4
+- Another improvement for cangjie5.txt
+- Change URLs in .spec file to point to new upstream repo
+- Remove patches which are included upstream.
+
+* Thu Dec 30 2021 Mike FABIAN <mfabian@redhat.com> - 1.8.3-11
+- Improve cangjie5.txt
+- Resolves: https://github.com/mike-fabian/ibus-table/issues/76
+
+* Tue Dec 28 2021 Mike FABIAN <mfabian@redhat.com> - 1.8.3-10
+- Add appdata.xml files for the subpackages where they were missing
+- Fix URLs in existing appdata.xml files
+- Resolves: rhbz#2035337
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sun May 16 2021 Mike FABIAN <mfabian@redhat.com> - 1.8.3-8
+- Correct misplaced non-alphabetic symbol in wubi-jidian table
+- Resolves: https://github.com/definite/ibus-table-chinese/pull/16

 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild