From b3293cdd26201b84737b2bfdd3c32d1391aada9a Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Tue, 30 Jan 2024 13:31:11 +0900 Subject: [PATCH] Resolves #2261242 Update era.t with 2024 - Add appstream-util validattion --- ibus-anthy-HEAD.patch | 39 +++++++++++++++++++++++++++++++++++++++ ibus-anthy.spec | 10 ++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/ibus-anthy-HEAD.patch b/ibus-anthy-HEAD.patch index 141a2e8..de26236 100644 --- a/ibus-anthy-HEAD.patch +++ b/ibus-anthy-HEAD.patch @@ -83,3 +83,42 @@ index 7c0d283..4b50a01 100644 -- 2.41.0 +From 0cb7776994fadb4a4edf3259133bb40e7db31936 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 30 Jan 2024 11:47:51 +0900 +Subject: [PATCH] data: Update era.t with 2024 + +--- + data/era.t | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/data/era.t b/data/era.t +index 7f7bd1b..8750bc5 100644 +--- a/data/era.t ++++ b/data/era.t +@@ -2,7 +2,7 @@ + # + # ibus-anthy - The Anthy engine for IBus + # +-# Copyright (c) 2010-2023 Takao Fujiwara ++# Copyright (c) 2010-2024 Takao Fujiwara + # Copyright (c) 2010-2013 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -342,6 +342,8 @@ + れいわ4 #T35*500 2022 + れいわ5 #T35*500 令和5 + れいわ5 #T35*500 2023 ++れいわ6 #T35*500 令和6 ++れいわ6 #T35*500 2024 + 1868 #T35*500 明治1 + 1869 #T35*500 明治2 + 1870 #T35*500 明治3 +@@ -502,3 +504,4 @@ + 2021 #T35*500 令和3 + 2022 #T35*500 令和4 + 2023 #T35*500 令和5 ++2024 #T35*500 令和6 +-- +2.43.0 + diff --git a/ibus-anthy.spec b/ibus-anthy.spec index 1563415..f7ce310 100644 --- a/ibus-anthy.spec +++ b/ibus-anthy.spec @@ -18,7 +18,7 @@ Name: ibus-anthy Version: 1.5.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Anthy engine for IBus input platform License: GPL-2.0-or-later URL: https://github.com/ibus/ibus/wiki @@ -40,6 +40,7 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-gobject +BuildRequires: /usr/bin/appstream-util Requires: ibus >= %{require_ibus_version} %if %{with kasumi_unicode} @@ -118,6 +119,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libanthygobject-%{sub_version}.la %check desktop-file-validate \ $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-anthy.desktop +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.xml export LANG=C.UTF-8 locale make -C data check @@ -138,10 +140,10 @@ make -C data check %files python %{_libexecdir}/ibus-*-anthy -%{_datadir}/metainfo/*.metainfo.xml %{_datadir}/ibus-anthy/engine %{_datadir}/ibus-anthy/setup %{_datadir}/ibus/component/* +%{_metainfodir}/*.xml %files devel %{_datadir}/gir-1.0/Anthy*.gir @@ -155,6 +157,10 @@ make -C data check %{_datadir}/installed-tests/%{name} %changelog +* Tue Jan 30 2024 Takao Fujiwara - 1.5.15-5 +- Resolves #2261242 Update era.t with 2024 +- Add appstream-util validattion + * Wed Jan 24 2024 Fedora Release Engineering - 1.5.15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild