From 726911c0de22d7a6bc1b5767f3a110fa74949d60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:23:36 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- anthy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anthy.spec b/anthy.spec index 5c1cde6..5be4e50 100644 --- a/anthy.spec +++ b/anthy.spec @@ -10,7 +10,7 @@ Name: anthy Version: 9100h -Release: 50%{?dist} +Release: 51%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.1-or-later AND GPL-2.0-only AND LicenseRef-Fedora-Public-Domain URL: http://sourceforge.jp/projects/anthy/ @@ -177,6 +177,9 @@ popd %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 9100h-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 9100h-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 861cb04cf9c2f67960c7e6660b0b7fbcd95ec907 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 28 Nov 2023 16:35:40 +0900 Subject: [PATCH 02/10] Fix symbol error on Emacs 29. Resolves: rhbz#2251128 --- anthy-fix-emacs29.patch | 12 ++++++++++++ anthy.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 anthy-fix-emacs29.patch diff --git a/anthy-fix-emacs29.patch b/anthy-fix-emacs29.patch new file mode 100644 index 0000000..ed1dcfc --- /dev/null +++ b/anthy-fix-emacs29.patch @@ -0,0 +1,12 @@ +diff -pruN anthy-9100h.orig/src-util/anthy.el anthy-9100h/src-util/anthy.el +--- anthy-9100h.orig/src-util/anthy.el 2023-11-28 16:31:37.621098068 +0900 ++++ anthy-9100h/src-util/anthy.el 2023-11-28 16:33:42.330200131 +0900 +@@ -71,7 +71,7 @@ + (defvar anthy-highlight-face nil) + (defvar anthy-underline-face nil) + (copy-face 'highlight 'anthy-highlight-face) +-(set-face-underline-p 'anthy-highlight-face t) ++(set-face-underline 'anthy-highlight-face t) + (copy-face 'underline 'anthy-underline-face) + + ;; diff --git a/anthy.spec b/anthy.spec index 5be4e50..f8b0ea2 100644 --- a/anthy.spec +++ b/anthy.spec @@ -10,7 +10,7 @@ Name: anthy Version: 9100h -Release: 51%{?dist} +Release: 52%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.1-or-later AND GPL-2.0-only AND LicenseRef-Fedora-Public-Domain URL: http://sourceforge.jp/projects/anthy/ @@ -29,6 +29,7 @@ Patch10: %{name}-corpus.patch Patch11: %{name}-fix-elisp.patch Patch12: %{name}-aarch64.patch Patch13: %{name}-fix-segfault.patch +Patch14: %{name}-fix-emacs29.patch Summary: Japanese character set input library Requires: emacs-filesystem >= %{_emacs_version} @@ -177,6 +178,10 @@ popd %changelog +* Tue Nov 28 2023 Akira TAGOH - 9100h-52 +- Fix symbol error on Emacs 29. + Resolves: rhbz#2251128 + * Wed Jul 19 2023 Fedora Release Engineering - 9100h-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From db5a572a2100825f6e2a32e44aa07e17c31ce93d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:05:11 +0000 Subject: [PATCH 03/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- anthy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anthy.spec b/anthy.spec index f8b0ea2..373ac9f 100644 --- a/anthy.spec +++ b/anthy.spec @@ -10,7 +10,7 @@ Name: anthy Version: 9100h -Release: 52%{?dist} +Release: 53%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.1-or-later AND GPL-2.0-only AND LicenseRef-Fedora-Public-Domain URL: http://sourceforge.jp/projects/anthy/ @@ -178,6 +178,9 @@ popd %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 9100h-53 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 28 2023 Akira TAGOH - 9100h-52 - Fix symbol error on Emacs 29. Resolves: rhbz#2251128 From 89c726ba9942ba197ef70e4feeec9d10b93d485d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:09:32 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- anthy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anthy.spec b/anthy.spec index 373ac9f..5a4639b 100644 --- a/anthy.spec +++ b/anthy.spec @@ -10,7 +10,7 @@ Name: anthy Version: 9100h -Release: 53%{?dist} +Release: 54%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.1-or-later AND GPL-2.0-only AND LicenseRef-Fedora-Public-Domain URL: http://sourceforge.jp/projects/anthy/ @@ -178,6 +178,9 @@ popd %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 9100h-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 9100h-53 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 038875320b901263da6de4a5d98899173aaf3d7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:06:46 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- anthy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anthy.spec b/anthy.spec index 5a4639b..a90b7f8 100644 --- a/anthy.spec +++ b/anthy.spec @@ -10,7 +10,7 @@ Name: anthy Version: 9100h -Release: 54%{?dist} +Release: 55%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.1-or-later AND GPL-2.0-only AND LicenseRef-Fedora-Public-Domain URL: http://sourceforge.jp/projects/anthy/ @@ -178,6 +178,9 @@ popd %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 9100h-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 9100h-54 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b02b7add018d57a71da3ce2b45b4a34253145801 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 19 Sep 2024 16:53:23 +0900 Subject: [PATCH 06/10] Fix an infinite loop when missing EOL in record file. Resolves: rhbz#1944546 --- anthy-fix-eol.patch | 12 ++++++++++++ anthy.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 anthy-fix-eol.patch diff --git a/anthy-fix-eol.patch b/anthy-fix-eol.patch new file mode 100644 index 0000000..87cb772 --- /dev/null +++ b/anthy-fix-eol.patch @@ -0,0 +1,12 @@ +diff -pruN anthy-9100h.orig/src-worddic/record.c anthy-9100h/src-worddic/record.c +--- anthy-9100h.orig/src-worddic/record.c 2009-01-27 21:11:21.000000000 +0900 ++++ anthy-9100h/src-worddic/record.c 2024-09-19 16:45:00.587508410 +0900 +@@ -1043,7 +1043,7 @@ out: + if (s) { + s[len] = '\0'; + } +- *eol = (c == '\n'); ++ *eol = (c == '\n' || c == EOF); + return s; + } + diff --git a/anthy.spec b/anthy.spec index a90b7f8..b3c5ba9 100644 --- a/anthy.spec +++ b/anthy.spec @@ -10,7 +10,7 @@ Name: anthy Version: 9100h -Release: 55%{?dist} +Release: 56%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.1-or-later AND GPL-2.0-only AND LicenseRef-Fedora-Public-Domain URL: http://sourceforge.jp/projects/anthy/ @@ -30,6 +30,7 @@ Patch11: %{name}-fix-elisp.patch Patch12: %{name}-aarch64.patch Patch13: %{name}-fix-segfault.patch Patch14: %{name}-fix-emacs29.patch +Patch15: %{name}-fix-eol.patch Summary: Japanese character set input library Requires: emacs-filesystem >= %{_emacs_version} @@ -178,6 +179,10 @@ popd %changelog +* Thu Sep 19 2024 Akira TAGOH - 9100h-56 +- Fix an infinite loop when missing EOL in record file. + Resolves: rhbz#1944546 + * Wed Jul 17 2024 Fedora Release Engineering - 9100h-55 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9f2261715c0748141887fccc66d5e4ba15d283ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:10:52 +0000 Subject: [PATCH 07/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- anthy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anthy.spec b/anthy.spec index b3c5ba9..f9bf097 100644 --- a/anthy.spec +++ b/anthy.spec @@ -10,7 +10,7 @@ Name: anthy Version: 9100h -Release: 56%{?dist} +Release: 57%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.1-or-later AND GPL-2.0-only AND LicenseRef-Fedora-Public-Domain URL: http://sourceforge.jp/projects/anthy/ @@ -179,6 +179,9 @@ popd %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 9100h-57 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Sep 19 2024 Akira TAGOH - 9100h-56 - Fix an infinite loop when missing EOL in record file. Resolves: rhbz#1944546 From b818691011b489fa27c3a8bc622243512b57818b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:03:25 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- anthy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anthy.spec b/anthy.spec index f9bf097..32d54ff 100644 --- a/anthy.spec +++ b/anthy.spec @@ -10,7 +10,7 @@ Name: anthy Version: 9100h -Release: 57%{?dist} +Release: 58%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.1-or-later AND GPL-2.0-only AND LicenseRef-Fedora-Public-Domain URL: http://sourceforge.jp/projects/anthy/ @@ -179,6 +179,9 @@ popd %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 9100h-58 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 9100h-57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 80d1caa5bc6c98914b9aadfe61795c2cff3034fd Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 18 Aug 2025 19:35:28 +0900 Subject: [PATCH 09/10] ci: migrate STI tests to tmt Resolves: rhbz#2382857 --- .fmf/version | 1 + plans/basic.fmf | 5 +++++ tests/basic/main.fmf | 5 +++++ tests/basic/test.sh | 14 ++++++++++++++ tests/basic/word.txt | 8 ++++++++ tests/runtest.sh | 4 ---- tests/tests.yml | 9 --------- 7 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/basic/main.fmf create mode 100755 tests/basic/test.sh create mode 100644 tests/basic/word.txt delete mode 100755 tests/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/basic/main.fmf b/tests/basic/main.fmf new file mode 100644 index 0000000..3cde53c --- /dev/null +++ b/tests/basic/main.fmf @@ -0,0 +1,5 @@ +summary: Basic test for anthy +require: + - anthy +test: ./test.sh +framework: beakerlib diff --git a/tests/basic/test.sh b/tests/basic/test.sh new file mode 100755 index 0000000..e71c4ce --- /dev/null +++ b/tests/basic/test.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k + +basedir=$(pwd) + +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartTest + rlRun "cat word.txt | iconv -f utf-8 -t euc-jp | anthy-dic-tool --load 0 "Registering a word to dict" + rlRun "anthy-dic-tool --dump | iconv -f euc-jp -t utf-8 | grep -v "#" | tee output" 0 "Dumping dict" + rlRun "diff -u word.txt output" 0 "Check difference" + rlPhaseEnd +rlJournalEnd diff --git a/tests/basic/word.txt b/tests/basic/word.txt new file mode 100644 index 0000000..781130e --- /dev/null +++ b/tests/basic/word.txt @@ -0,0 +1,8 @@ +てすと 1 テスト +格助詞接続 = y +語幹のみで文節 = y +する接続 = y +さ接続 = y +な接続 = y +品詞 = 名詞 + diff --git a/tests/runtest.sh b/tests/runtest.sh deleted file mode 100755 index 26aba13..0000000 --- a/tests/runtest.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -echo "RESULT: PASS" - diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index b7184da..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,9 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - required_packages: - - anthy - tests: - - run: ./runtest.sh From ed90f959162924647d59d5624ce7173655f550f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:44:38 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- anthy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anthy.spec b/anthy.spec index 32d54ff..d12eca0 100644 --- a/anthy.spec +++ b/anthy.spec @@ -10,7 +10,7 @@ Name: anthy Version: 9100h -Release: 58%{?dist} +Release: 59%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.1-or-later AND GPL-2.0-only AND LicenseRef-Fedora-Public-Domain URL: http://sourceforge.jp/projects/anthy/ @@ -179,6 +179,9 @@ popd %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 9100h-59 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 9100h-58 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild