From bfe4f725fbd9d156e76543028069b3e92af6c2a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:06:33 +0000 Subject: [PATCH 01/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- anthy-unicode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anthy-unicode.spec b/anthy-unicode.spec index 470c979..5893d3a 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -10,7 +10,7 @@ Name: anthy-unicode Version: 1.0.0.20211224 -Release: 10%{?dist} +Release: 11%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.0-or-later and GPL-2.0-or-later and LicenseRef-Fedora-Public-Domain URL: https://github.com/fujiwarat/anthy-unicode/wiki @@ -168,6 +168,9 @@ cd .. %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.0.20211224-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.0.0.20211224-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 35cbfdded7487fce5f03655bb93728941d87f297 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:09:41 +0000 Subject: [PATCH 02/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- anthy-unicode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anthy-unicode.spec b/anthy-unicode.spec index 5893d3a..c0c9966 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -10,7 +10,7 @@ Name: anthy-unicode Version: 1.0.0.20211224 -Release: 11%{?dist} +Release: 12%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.0-or-later and GPL-2.0-or-later and LicenseRef-Fedora-Public-Domain URL: https://github.com/fujiwarat/anthy-unicode/wiki @@ -168,6 +168,9 @@ cd .. %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.0.0.20211224-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.0.0.20211224-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2be875b605d73260fd64fedb03a4a781c24aa938 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Thu, 14 Mar 2024 21:29:32 +0900 Subject: [PATCH 03/17] =?UTF-8?q?Resolves=20#2269401=20Fix=20=E3=81=8A?= =?UTF-8?q?=E3=81=8D=E3=81=AE=E3=81=88=E3=82=89=E3=81=B6=20in=20gcanna.ctd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anthy-unicode-HEAD.patch | 32 ++++++++++++++++++++++++++++++++ anthy-unicode.spec | 9 ++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/anthy-unicode-HEAD.patch b/anthy-unicode-HEAD.patch index a8c13a4..cc87aff 100644 --- a/anthy-unicode-HEAD.patch +++ b/anthy-unicode-HEAD.patch @@ -145,3 +145,35 @@ index cc2cf89..0138d17 100644 -- 2.35.3 +From d6e048916fee926818212e1d9f8dbd37e19f2794 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Thu, 14 Mar 2024 20:59:22 +0900 +Subject: [PATCH] =?UTF-8?q?alt-cannadic:=20Fix=20=E3=81=8A=E3=81=8D?= + =?UTF-8?q?=E3=81=AE=E3=81=88=E3=82=89=E3=81=B6=20in=20gcanna.ctd?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG=rhbz#2269401 +--- + alt-cannadic/gcanna.ctd | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/alt-cannadic/gcanna.ctd b/alt-cannadic/gcanna.ctd +index f596e89..ec60e91 100644 +--- a/alt-cannadic/gcanna.ctd ++++ b/alt-cannadic/gcanna.ctd +@@ -16935,8 +16935,8 @@ + おきにゅうさつ #T30*10 置き入札 + おきぬけ #T35*200 起き抜け #T35*180 起きぬけ + おきの #JN*50 沖野 +-おきのえらぶ #CN*180 沖永良 +-おきのえらぶじま #CN*10 沖永良島 ++おきのえらぶ #CN*180 沖永良部 ++おきのえらぶじま #CN*10 沖永良部島 + おきのしま #CN*150 隠岐の島 #CN*101 沖ノ島 #CN*100 沖の島 + おきのしまちょう #CN*150 隠岐の島町 + おきのとりしま #CN*150 沖ノ鳥島 +-- +2.43.0 + diff --git a/anthy-unicode.spec b/anthy-unicode.spec index c0c9966..a1621e7 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -10,7 +10,7 @@ Name: anthy-unicode Version: 1.0.0.20211224 -Release: 12%{?dist} +Release: 13%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.0-or-later and GPL-2.0-or-later and LicenseRef-Fedora-Public-Domain URL: https://github.com/fujiwarat/anthy-unicode/wiki @@ -47,7 +47,7 @@ other conversion server. %package -n emacs-%{pkg} Summary: Emacs files for %{pkg} Requires: %{name} = %{version}-%{release} -Requires: emacs(bin) >= %{_emacs_version} +Requires: emacs-filesystem >= %{_emacs_version} BuildArch: noarch %description -n emacs-%{pkg} @@ -58,7 +58,7 @@ with GNU Emacs. %package -n xemacs-%{pkg} Summary: XEmacs files for %{pkg} Requires: %{name} = %{version}-%{release} -Requires: xemacs(bin) >= %{_xemacs_version} +Requires: xemacs-filesystem >= %{_xemacs_version} BuildArch: noarch %description -n xemacs-%{pkg} @@ -168,6 +168,9 @@ cd .. %changelog +* Thu Mar 14 2024 Takao Fujiwara 1.0.0.20211224-13 +- Resolves #2269401 Fix おきのえらぶ in gcanna.ctd + * Mon Jan 22 2024 Fedora Release Engineering - 1.0.0.20211224-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8315cdb07a8534b3a6aba448bf4f131c48a446a9 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Thu, 2 May 2024 14:37:23 +0900 Subject: [PATCH 04/17] Use autochangelog --- anthy-unicode.spec | 93 +--------------------------------------------- changelog | 91 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 91 deletions(-) create mode 100644 changelog diff --git a/anthy-unicode.spec b/anthy-unicode.spec index a1621e7..caa3a9b 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -10,7 +10,7 @@ Name: anthy-unicode Version: 1.0.0.20211224 -Release: 13%{?dist} +Release: %autorelease # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.0-or-later and GPL-2.0-or-later and LicenseRef-Fedora-Public-Domain URL: https://github.com/fujiwarat/anthy-unicode/wiki @@ -168,94 +168,5 @@ cd .. %changelog -* Thu Mar 14 2024 Takao Fujiwara 1.0.0.20211224-13 -- Resolves #2269401 Fix おきのえらぶ in gcanna.ctd +%autochangelog -* Mon Jan 22 2024 Fedora Release Engineering - 1.0.0.20211224-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.0.0.20211224-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.0.0.20211224-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.0.0.20211224-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Nov 16 2022 Takao Fujiwara 1.0.0.20211224-8 -- Migrate license tag to SPDX - -* Wed Jul 20 2022 Fedora Release Engineering - 1.0.0.20211224-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Takao Fujiwara 1.0.0.20211224-6 -- Rename master_dic_file to main_dic_file - -* Fri May 06 2022 Takao Fujiwara 1.0.0.20211224-5 -- Fix GCC_ANALYZER_WARNING with -Wanalyzer-null-dereference - -* Fri Feb 11 2022 Takao Fujiwara 1.0.0.20211224-4 -- Resolves: #2051670 xemacs is a dead package - -* Wed Jan 19 2022 Fedora Release Engineering - 1.0.0.20211224-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Dec 24 2021 Takao Fujiwara 1.0.0.20211224-1 -- Bump to 1.0.0.20211224-1 - -* Tue Oct 26 2021 Takao Fujiwara 1.0.0.20201109-10 -- Resolves: #1998727 Fix emacs-anthy-unicode - -* Thu Oct 21 2021 Takao Fujiwara 1.0.0.20201109-8 -- Resolves: #2007482 Update gcanna.ctd with Shubitai - -* Wed Jul 21 2021 Fedora Release Engineering - 1.0.0.20201109-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 13 2021 Takao Fujiwara 1.0.0.20201109-6 -- Fix covscan report - -* Mon Jul 12 2021 Takao Fujiwara 1.0.0.20201109-5 -- Fix covscan report - -* Mon May 03 2021 Takao Fujiwara 1.0.0.20201109-4 -- Delete unnecessary xemacs in tests/tests.yml - -* Sat May 01 2021 Takao Fujiwara 1.0.0.20201109-3 -- Enable CI - -* Tue Jan 26 2021 Fedora Release Engineering - 1.0.0.20201109-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 09 2020 Takao Fujiwara 1.0.0.20201109-1 -- Bump 1.0.0.20201109 - -* Fri Jul 31 2020 Fedora Release Engineering - 1.0.0.20191015-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.0.0.20191015-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 1.0.0.20191015-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Oct 21 2019 Takao Fujiwara 1.0.0.20191015-2 -- Add %%check to run local test programs - -* Tue Oct 15 2019 Takao Fujiwara 1.0.0.20191015-1 -- Release anthy-unicode 1.0.0.20191015 - -* Wed Aug 07 2019 Takao Fujiwara 1.0.0.20190412-1 -- Initial package -- Update license -- Delete Group tags -- Make parse_modify_freq_command() for UTF-8 -- Revert ptab.h to EUC-JP -- BuildRequire: git -- Genearate emacs- and xemacs- sub packages -- Fix some obsolete warnings in emacs batch-byte-compile -- Fix shared-lib-calls-exit -- Fix non-conffile-in-etc -- Fix description-line-too-long diff --git a/changelog b/changelog new file mode 100644 index 0000000..a67b8a6 --- /dev/null +++ b/changelog @@ -0,0 +1,91 @@ +* Thu Mar 14 2024 Takao Fujiwara 1.0.0.20211224-13 +- Resolves #2269401 Fix おきのえらぶ in gcanna.ctd + +* Mon Jan 22 2024 Fedora Release Engineering - 1.0.0.20211224-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.0.20211224-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1.0.0.20211224-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.0.0.20211224-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Nov 16 2022 Takao Fujiwara 1.0.0.20211224-8 +- Migrate license tag to SPDX + +* Wed Jul 20 2022 Fedora Release Engineering - 1.0.0.20211224-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 19 2022 Takao Fujiwara 1.0.0.20211224-6 +- Rename master_dic_file to main_dic_file + +* Fri May 06 2022 Takao Fujiwara 1.0.0.20211224-5 +- Fix GCC_ANALYZER_WARNING with -Wanalyzer-null-dereference + +* Fri Feb 11 2022 Takao Fujiwara 1.0.0.20211224-4 +- Resolves: #2051670 xemacs is a dead package + +* Wed Jan 19 2022 Fedora Release Engineering - 1.0.0.20211224-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Dec 24 2021 Takao Fujiwara 1.0.0.20211224-1 +- Bump to 1.0.0.20211224-1 + +* Tue Oct 26 2021 Takao Fujiwara 1.0.0.20201109-10 +- Resolves: #1998727 Fix emacs-anthy-unicode + +* Thu Oct 21 2021 Takao Fujiwara 1.0.0.20201109-8 +- Resolves: #2007482 Update gcanna.ctd with Shubitai + +* Wed Jul 21 2021 Fedora Release Engineering - 1.0.0.20201109-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 13 2021 Takao Fujiwara 1.0.0.20201109-6 +- Fix covscan report + +* Mon Jul 12 2021 Takao Fujiwara 1.0.0.20201109-5 +- Fix covscan report + +* Mon May 03 2021 Takao Fujiwara 1.0.0.20201109-4 +- Delete unnecessary xemacs in tests/tests.yml + +* Sat May 01 2021 Takao Fujiwara 1.0.0.20201109-3 +- Enable CI + +* Tue Jan 26 2021 Fedora Release Engineering - 1.0.0.20201109-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Nov 09 2020 Takao Fujiwara 1.0.0.20201109-1 +- Bump 1.0.0.20201109 + +* Fri Jul 31 2020 Fedora Release Engineering - 1.0.0.20191015-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.0.0.20191015-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.0.20191015-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Oct 21 2019 Takao Fujiwara 1.0.0.20191015-2 +- Add %%check to run local test programs + +* Tue Oct 15 2019 Takao Fujiwara 1.0.0.20191015-1 +- Release anthy-unicode 1.0.0.20191015 + +* Wed Aug 07 2019 Takao Fujiwara 1.0.0.20190412-1 +- Initial package +- Update license +- Delete Group tags +- Make parse_modify_freq_command() for UTF-8 +- Revert ptab.h to EUC-JP +- BuildRequire: git +- Genearate emacs- and xemacs- sub packages +- Fix some obsolete warnings in emacs batch-byte-compile +- Fix shared-lib-calls-exit +- Fix non-conffile-in-etc +- Fix description-line-too-long From 684be1453108bc89943186bd95145882db4f8ae7 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Thu, 2 May 2024 14:43:53 +0900 Subject: [PATCH 05/17] Delete upstreamed anthy-unicode-HEAD.patch --- anthy-unicode-HEAD.patch | 179 --------------------------------------- 1 file changed, 179 deletions(-) delete mode 100644 anthy-unicode-HEAD.patch diff --git a/anthy-unicode-HEAD.patch b/anthy-unicode-HEAD.patch deleted file mode 100644 index cc87aff..0000000 --- a/anthy-unicode-HEAD.patch +++ /dev/null @@ -1,179 +0,0 @@ -From d9355d3e0fac58eab16684fed2715cc91f68d39e Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Fri, 11 Feb 2022 10:28:18 +0900 -Subject: [PATCH] src-util: set-face-underline is not available in xemacs Lisp - ---- - src-util/anthy-unicode.el | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src-util/anthy-unicode.el b/src-util/anthy-unicode.el -index 14a9db4..902c7ac 100644 ---- a/src-util/anthy-unicode.el -+++ b/src-util/anthy-unicode.el -@@ -74,7 +74,8 @@ - (defvar anthy-highlight-face nil) - (defvar anthy-underline-face nil) - (copy-face 'highlight 'anthy-highlight-face) --(set-face-underline 'anthy-highlight-face t) -+(if (not (featurep 'xemacs)) -+ (set-face-underline 'anthy-highlight-face t)) - (copy-face 'underline 'anthy-underline-face) - - ;; --- -2.33.1 - -From 255323305b3621286cc4025ac59fa7d37fa1e7ce Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Fri, 6 May 2022 20:33:47 +0900 -Subject: [PATCH] src-main/context.c: Code reviews - ---- - src-main/context.c | 20 +++++++++++++++++++- - 1 file changed, 19 insertions(+), 1 deletion(-) - -diff --git a/src-main/context.c b/src-main/context.c -index 20dde71..d84858c 100644 ---- a/src-main/context.c -+++ b/src-main/context.c -@@ -451,7 +451,7 @@ anthy_get_nth_segment(struct segment_list *sl, int n) - n < 0) { - return NULL; - } -- for (i = 0, se = sl->list_head.next; i < n; i++, se = se->next); -+ for (i = 0, se = sl->list_head.next; (i < n) && se; i++, se = se->next); - return se; - } - -@@ -499,6 +499,17 @@ get_change_state(struct anthy_context *ac) - int i; - for (i = 0; i < ac->seg_list.nr_segments; i++) { - struct seg_ent *s = anthy_get_nth_segment(&ac->seg_list, i); -+ if (!ac->split_info.ce) { -+ anthy_log(0, "ac->split_info.ce is NULL %s:%d\n", __FILE__, __LINE__); -+ resize = 1; -+ break; -+ } -+ if (!s) { -+ anthy_log(0, "ac->seg_list %dth entry is NULL %s:%d\n", -+ i, __FILE__, __LINE__); -+ resize = 1; -+ continue; -+ } - if (ac->split_info.ce[s->from].initial_seg_len != s->len) { - resize = 1; - } -@@ -538,6 +549,11 @@ write_history(int fd, - struct seg_ent *s = anthy_get_nth_segment(&ac->seg_list, i); - char *c; - /**/ -+ if (!s) { -+ anthy_log(0, "ac->seg_list %dth entry is NULL %s:%d\n", -+ i, __FILE__, __LINE__); -+ continue; -+ } - if (s->committed < 0) { - dprintf(fd, "?|"); - continue ; -@@ -647,9 +663,11 @@ print_segment(struct seg_ent *e) - { - int i; - -+ assert(e); - anthy_putxstr(&e->str); - printf("("); - for ( i = 0 ; i < e->nr_cands ; i++) { -+ assert(e->cands); - anthy_print_candidate(e->cands[i]); - printf(","); - } --- -2.35.1 - -From 754f1c8b18ce0bf9c5e25541f4f4707d8a982811 Mon Sep 17 00:00:00 2001 -From: Jens Petersen -Date: Thu, 9 Jun 2022 11:47:18 +0800 -Subject: [PATCH] word_dic.c: rename master_dic_file to main_dic_file - ---- - src-worddic/word_dic.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src-worddic/word_dic.c b/src-worddic/word_dic.c -index cc2cf89..0138d17 100644 ---- a/src-worddic/word_dic.c -+++ b/src-worddic/word_dic.c -@@ -46,7 +46,7 @@ static int dic_init_count; - - /* 辞書 */ - /* 全personalityで共有されるファイル辞書 */ --static struct word_dic *master_dic_file; -+static struct word_dic *main_dic_file; - - /* 各パーソナリティごとの辞書 */ - struct mem_dic *anthy_current_personal_dic_cache;/* キャッシュ */ -@@ -89,7 +89,7 @@ anthy_cache_get_seq_ent(xstr *xs, int is_reverse) - int - anthy_dic_check_word_relation(int from, int to) - { -- return anthy_word_dic_check_word_relation(master_dic_file, from, to); -+ return anthy_word_dic_check_word_relation(main_dic_file, from, to); - } - - static seq_ent_t -@@ -349,7 +349,7 @@ do_gang_load_dic(xstr *sentence, int is_reverse) - } - qsort(array, nr, sizeof(struct gang_elm *), gang_elm_compare_func); - /**/ -- anthy_gang_fill_seq_ent(master_dic_file, array, nr, is_reverse); -+ anthy_gang_fill_seq_ent(main_dic_file, array, nr, is_reverse); - /**/ - scan_misc_dic(array, nr, is_reverse); - /* 個人辞書から読む */ -@@ -769,8 +769,8 @@ anthy_init_dic(void) - anthy_init_features(); - - anthy_init_word_dic(); -- master_dic_file = anthy_create_word_dic(); -- if (!master_dic_file) { -+ main_dic_file = anthy_create_word_dic(); -+ if (!main_dic_file) { - anthy_log(0, "Failed to create file dic.\n"); - return -1; - } --- -2.35.3 - -From d6e048916fee926818212e1d9f8dbd37e19f2794 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Thu, 14 Mar 2024 20:59:22 +0900 -Subject: [PATCH] =?UTF-8?q?alt-cannadic:=20Fix=20=E3=81=8A=E3=81=8D?= - =?UTF-8?q?=E3=81=AE=E3=81=88=E3=82=89=E3=81=B6=20in=20gcanna.ctd?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -BUG=rhbz#2269401 ---- - alt-cannadic/gcanna.ctd | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/alt-cannadic/gcanna.ctd b/alt-cannadic/gcanna.ctd -index f596e89..ec60e91 100644 ---- a/alt-cannadic/gcanna.ctd -+++ b/alt-cannadic/gcanna.ctd -@@ -16935,8 +16935,8 @@ - おきにゅうさつ #T30*10 置き入札 - おきぬけ #T35*200 起き抜け #T35*180 起きぬけ - おきの #JN*50 沖野 --おきのえらぶ #CN*180 沖永良 --おきのえらぶじま #CN*10 沖永良島 -+おきのえらぶ #CN*180 沖永良部 -+おきのえらぶじま #CN*10 沖永良部島 - おきのしま #CN*150 隠岐の島 #CN*101 沖ノ島 #CN*100 沖の島 - おきのしまちょう #CN*150 隠岐の島町 - おきのとりしま #CN*150 沖ノ鳥島 --- -2.43.0 - From 2fec30971420777ddc8569781c8177e3ebd7cf4c Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Thu, 2 May 2024 15:00:20 +0900 Subject: [PATCH 06/17] Bump to 1.0.0.20240502 --- .gitignore | 1 + anthy-unicode-1.0.0.20240502.tar.gz.sum | 4 ++++ anthy-unicode-HEAD.patch | 0 anthy-unicode.spec | 15 ++++++++++----- sources | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 anthy-unicode-1.0.0.20240502.tar.gz.sum create mode 100644 anthy-unicode-HEAD.patch diff --git a/.gitignore b/.gitignore index a84de3d..7679a8a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /anthy-unicode-1.0.0.20191015.tar.gz /anthy-unicode-1.0.0.20201109.tar.gz /anthy-unicode-1.0.0.20211224.tar.gz +/anthy-unicode-1.0.0.20240502.tar.gz diff --git a/anthy-unicode-1.0.0.20240502.tar.gz.sum b/anthy-unicode-1.0.0.20240502.tar.gz.sum new file mode 100644 index 0000000..5cf1eac --- /dev/null +++ b/anthy-unicode-1.0.0.20240502.tar.gz.sum @@ -0,0 +1,4 @@ +cksum 2650323057 5196128 anthy-unicode-1.0.0.20240502.tar.gz +sha1sum 18c885dc0821ec675bee95e138ac7acd88ff3a3a anthy-unicode-1.0.0.20240502.tar.gz +sha256sum 43a13f24cc4749a1248bc6d0ce7796743b176ae68ee524cb4331bef64ac133b0 anthy-unicode-1.0.0.20240502.tar.gz +sha512sum 835f7cbd5c3afc3dcd7002b77c94a5c69e67f970584c223b47329ece011148cbc4e9f65332c00bbdbe2f407a2daa7f9e10067a182a27d07074e0f1406bb3bbc2 anthy-unicode-1.0.0.20240502.tar.gz diff --git a/anthy-unicode-HEAD.patch b/anthy-unicode-HEAD.patch new file mode 100644 index 0000000..e69de29 diff --git a/anthy-unicode.spec b/anthy-unicode.spec index caa3a9b..88953f5 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -9,7 +9,7 @@ Name: anthy-unicode -Version: 1.0.0.20211224 +Version: 1.0.0.20240502 Release: %autorelease # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.0-or-later and GPL-2.0-or-later and LicenseRef-Fedora-Public-Domain @@ -30,10 +30,10 @@ BuildRequires: make %endif Source0: https://github.com/fujiwarat/anthy-unicode/releases/download/%{version}/%{name}-%{version}.tar.gz -Source1: %{name}-init.el +Source1: https://github.com/fujiwarat/anthy-unicode/releases/download/%{version}/%{name}-%{version}.tar.gz.sum +Source2: %{name}-init.el # Upstreamed patches #Patch0: %%{name}-HEAD.patch -Patch0: %{name}-HEAD.patch Summary: Japanese character set input library for Unicode @@ -76,6 +76,11 @@ the programs which uses Anthy Unicode. %prep +SAVED_SUM=$(grep sha512sum %SOURCE1 | awk '{print $2}') +MY_SUM=$(sha512sum %SOURCE0 | awk '{print $1}') +if test x"$SAVED_SUM" != x"$MY_SUM" ; then + abort +fi %autosetup -S git %build @@ -93,12 +98,12 @@ rm $RPM_BUILD_ROOT%{_libdir}/lib*.la ## for emacs-anthy mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir} -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir} +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir} %if %{with xemacs} ## for xemacs-anthy mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir} -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_xemacs_sitestartdir} +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_xemacs_sitestartdir} # FIXME lisp build pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util make clean diff --git a/sources b/sources index 019ac59..b3ba7ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anthy-unicode-1.0.0.20211224.tar.gz) = 8971129df716b4cb21c5c9fb24a98388381d8172004126f68c037d47721b0fd9ab9cb0b6ef73414e62bf9d832c59f09743546da72366c7692bfd146a05bf800d +SHA512 (anthy-unicode-1.0.0.20240502.tar.gz) = 835f7cbd5c3afc3dcd7002b77c94a5c69e67f970584c223b47329ece011148cbc4e9f65332c00bbdbe2f407a2daa7f9e10067a182a27d07074e0f1406bb3bbc2 From 4732973d3b05278fd11493bd3f021f14d0caf456 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Sat, 13 Jul 2024 00:39:26 +0900 Subject: [PATCH 07/17] Fix license-validate --- anthy-unicode.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anthy-unicode.spec b/anthy-unicode.spec index 88953f5..4847d93 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -12,7 +12,7 @@ Name: anthy-unicode Version: 1.0.0.20240502 Release: %autorelease # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. -License: LGPL-2.0-or-later and GPL-2.0-or-later and LicenseRef-Fedora-Public-Domain +License: LGPL-2.0-or-later AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain URL: https://github.com/fujiwarat/anthy-unicode/wiki BuildRequires: emacs BuildRequires: gcc From 41d0118e05fa378622886d3a757a55c19af5e329 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Sat, 13 Jul 2024 10:13:27 +0900 Subject: [PATCH 08/17] Drop emacs.i686 --- anthy-unicode.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/anthy-unicode.spec b/anthy-unicode.spec index 4847d93..e0c6918 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -7,6 +7,12 @@ %bcond_without xemacs %endif +# emacs.i686 has not been available since emacs-29.4-7.fc40 +%ifarch i686 +%bcond_with emacs +%else +%bcond_without emacs +%endif Name: anthy-unicode Version: 1.0.0.20240502 @@ -14,7 +20,9 @@ Release: %autorelease # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.0-or-later AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain URL: https://github.com/fujiwarat/anthy-unicode/wiki +%if %{with emacs} BuildRequires: emacs +%endif BuildRequires: gcc BuildRequires: git %if %{with xemacs} @@ -44,6 +52,7 @@ user dictionaries and the users information which is used for the conversion, is stored into their own home directory. So Anthy Unicode is secure than other conversion server. +%if %{with emacs} %package -n emacs-%{pkg} Summary: Emacs files for %{pkg} Requires: %{name} = %{version}-%{release} @@ -53,6 +62,7 @@ BuildArch: noarch %description -n emacs-%{pkg} This package contains the byte compiled elips packages to run %{pkg} with GNU Emacs. +%endif %if %{with xemacs} %package -n xemacs-%{pkg} @@ -96,9 +106,11 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # remove unnecessary files rm $RPM_BUILD_ROOT%{_libdir}/lib*.la +%if %{with emacs} ## for emacs-anthy mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir} install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir} +%endif %if %{with xemacs} ## for xemacs-anthy @@ -147,12 +159,14 @@ cd .. %{_libdir}/lib*.so.* %{_datadir}/%{pkg}/ +%if %{with emacs} %files -n emacs-%{pkg} %doc doc/ELISP %{_emacs_sitelispdir}/%{pkg}/*.el %{_emacs_sitelispdir}/%{pkg}/*.elc %{_emacs_sitestartdir}/*.el %dir %{_emacs_sitelispdir}/%{pkg} +%endif %if %{with xemacs} %files -n xemacs-%{pkg} From f73ccdfb76fbd2d4de9cf4ef96b109c6c5d91764 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Mon, 15 Jul 2024 14:57:21 +0900 Subject: [PATCH 09/17] Fix some compiler warnings - src-main/context.c: Fix warning[-Waddress] &ce->str will always evaluate as 'true' - mkworddic/mkdic.c: Fix warning[-Wformat-overflow=] '%s' directive argument is null --- anthy-unicode-HEAD.patch | 108 +++++++++++++++++++++++++++++++++++++++ anthy-unicode.spec | 1 + 2 files changed, 109 insertions(+) diff --git a/anthy-unicode-HEAD.patch b/anthy-unicode-HEAD.patch index e69de29..216e20c 100644 --- a/anthy-unicode-HEAD.patch +++ b/anthy-unicode-HEAD.patch @@ -0,0 +1,108 @@ +From a4a42a3c933a2f40023e6c857e60e0bf08a1d913 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Mon, 15 Jul 2024 14:53:17 +0900 +Subject: [PATCH] Fix some compiler warnings + +- src-main/context.c: Fix warning[-Waddress] + &ce->str will always evaluate as 'true' +- mkworddic/mkdic.c: Fix warning[-Wformat-overflow=] + '%s' directive argument is null +--- + mkworddic/mkdic.c | 21 +++++++++------------ + src-main/context.c | 5 ++--- + 2 files changed, 11 insertions(+), 15 deletions(-) + +diff --git a/mkworddic/mkdic.c b/mkworddic/mkdic.c +index b0f9f4c..cb68520 100644 +--- a/mkworddic/mkdic.c ++++ b/mkworddic/mkdic.c +@@ -60,8 +60,6 @@ + + #define DEFAULT_FN "anthy.wdic" + +-static const char *progname; +- + /* writewords.cからアクセスするために、global変数 */ + FILE *yomi_entry_index_out, *yomi_entry_out; + FILE *page_out, *page_index_out; +@@ -127,8 +125,7 @@ open_output_files(void) + } + /**/ + if (!(*(fs->fpp))) { +- fprintf (stderr, "%s: cannot open temporary file: %s\n", +- progname, strerror (errno)); ++ fprintf (stderr, "cannot open temporary file: %s\n", strerror (errno)); + exit (2); + } + } +@@ -142,13 +139,13 @@ flush_output_files (void) + struct file_section *fs; + for (fs = file_array; fs->fpp; fs ++) { + if (ferror(*(fs->fpp))) { +- fprintf (stderr, "%s: write error\n", progname); ++ fprintf (stderr, "write error\n"); + exit (1); + } + } + for (fs = file_array; fs->fpp; fs ++) { + if (fflush(*(fs->fpp))) { +- fprintf (stderr, "%s: write error: %s\n", progname, strerror (errno)); ++ fprintf (stderr, "write error: %s\n", strerror (errno)); + exit (1); + } + } +@@ -793,8 +790,8 @@ copy_file(struct mkdic_stat *mds, FILE *in, FILE *out) + while ((nread = fread (buf, 1, sizeof buf, in)) > 0) { + if (fwrite (buf, 1, nread, out) < nread) { + /* Handle short write (maybe disk full). */ +- fprintf (stderr, "%s: %s: write error: %s\n", +- progname, mds->output_fn, strerror (errno)); ++ fprintf (stderr, "%s: write error: %s\n", ++ mds->output_fn, strerror (errno)); + exit (1); + } + } +@@ -839,8 +836,8 @@ link_dics(struct mkdic_stat *mds) + + fp = fopen (mds->output_fn, "w"); + if (!fp) { +- fprintf (stderr, "%s: %s: cannot create: %s\n", +- progname, mds->output_fn, strerror (errno)); ++ fprintf (stderr, "%s: cannot create: %s\n", ++ mds->output_fn, strerror (errno)); + exit (1); + } + +@@ -856,8 +853,8 @@ link_dics(struct mkdic_stat *mds) + } + + if (fclose (fp)) { +- fprintf (stderr, "%s: %s: write error: %s\n", +- progname, mds->output_fn, strerror (errno)); ++ fprintf (stderr, "%s: write error: %s\n", ++ mds->output_fn, strerror (errno)); + exit (1); + } + } +diff --git a/src-main/context.c b/src-main/context.c +index d84858c..f117f7d 100644 +--- a/src-main/context.c ++++ b/src-main/context.c +@@ -706,12 +706,11 @@ anthy_do_print_context(struct anthy_context *ac, int encoding) + void + anthy_release_cand_ent(struct cand_ent *ce) + { ++ assert (ce); + if (ce->elm) { + free(ce->elm); + } +- if (&ce->str) { +- anthy_free_xstr_str(&ce->str); +- } ++ anthy_free_xstr_str(&ce->str); + free(ce); + } + +-- +2.45.0 + diff --git a/anthy-unicode.spec b/anthy-unicode.spec index e0c6918..842170f 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -42,6 +42,7 @@ Source1: https://github.com/fujiwarat/anthy-unicode/releases/download/%{version} Source2: %{name}-init.el # Upstreamed patches #Patch0: %%{name}-HEAD.patch +Patch0: %{name}-HEAD.patch Summary: Japanese character set input library for Unicode From 235965806601daf0231a8a54f833a20f8295185e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:06:56 +0000 Subject: [PATCH 10/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b275bea1863e8ca4df6bae36c108a14797e9b1a0 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Fri, 16 Aug 2024 11:08:08 +0900 Subject: [PATCH 11/17] Delete CI with STI CI with STI is archived in: https://src.fedoraproject.org/rpms/anthy-unicode/tree/ci-sti --- tests/tests.sh | 12 ------------ tests/tests.yml | 19 ------------------- 2 files changed, 31 deletions(-) delete mode 100755 tests/tests.sh delete mode 100644 tests/tests.yml diff --git a/tests/tests.sh b/tests/tests.sh deleted file mode 100755 index 9d18fcd..0000000 --- a/tests/tests.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -: ${SRCDIR:='./source'} - -anthy-dic-tool-unicode --load $SRCDIR/src-util/dic-tool-input -diff $HOME/.config/anthy/private_words_default $SRCDIR/src-util/dic-tool-result -anthy-dic-tool-unicode --dump -[ -d $HOME/.anthy ] || mkdir $HOME/.anthy -mv $HOME/.config/anthy/private_words_default $HOME/.anthy -anthy-dic-tool-unicode --migrate -diff $HOME/.config/anthy/private_words_default $SRCDIR/src-util/dic-tool-result - diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index c5f451c..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,19 +0,0 @@ -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-source - required_packages: - - git - vars: - fetch_only: True - - role: standard-test-basic - #- role: standard-test-beakerlib - required_packages: - - bash - - anthy-unicode - tests: - - smoke1: - dir: . - run: ./tests.sh - From cbe7995d7ca0141d93fd9882349952465aeb6060 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Fri, 16 Aug 2024 20:23:11 +0900 Subject: [PATCH 12/17] Implement CI with TMT - Add dic-tool-* test files to devel package --- .fmf/version | 1 + anthy-unicode.spec | 9 ++++++++- plans/dict-test.fmf | 5 +++++ tests/migration/main.fmf | 15 +++++++++++++++ tests/migration/test.sh | 16 ++++++++++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 .fmf/version create mode 100644 plans/dict-test.fmf create mode 100644 tests/migration/main.fmf create mode 100755 tests/migration/test.sh 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/anthy-unicode.spec b/anthy-unicode.spec index 842170f..0bfba64 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -107,6 +107,11 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # remove unnecessary files rm $RPM_BUILD_ROOT%{_libdir}/lib*.la +pushd ./src-util +install -m 644 dic-tool-input $RPM_BUILD_ROOT%{_datadir}/%{pkg} +install -m 644 dic-tool-result $RPM_BUILD_ROOT%{_datadir}/%{pkg} +popd + %if %{with emacs} ## for emacs-anthy mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir} @@ -118,7 +123,7 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir} mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir} install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_xemacs_sitestartdir} # FIXME lisp build -pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util +pushd ./src-util make clean #make EMACS=xemacs lispdir="%%{_xemacs_sitelispdir}/%%{pkg}" # The latest /usr/share/automake-*/am/lisp.am calls -L option for @@ -182,6 +187,8 @@ cd .. %files devel %doc doc/DICLIB doc/DICUTIL doc/GLOSSARY doc/GRAMMAR doc/GUIDE.english doc/ILIB doc/LEARNING doc/LIB doc/MISC doc/POS doc/SPLITTER doc/TESTING doc/protocol.txt +%{_datadir}/%{pkg}/dic-tool-input +%{_datadir}/%{pkg}/dic-tool-result %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc diff --git a/plans/dict-test.fmf b/plans/dict-test.fmf new file mode 100644 index 0000000..9c5ae63 --- /dev/null +++ b/plans/dict-test.fmf @@ -0,0 +1,5 @@ +summary: anthy-unicode test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/migration/main.fmf b/tests/migration/main.fmf new file mode 100644 index 0000000..843d404 --- /dev/null +++ b/tests/migration/main.fmf @@ -0,0 +1,15 @@ +summary: Migration tests of private dicts from anthy to anthy-unicode +test: ./test.sh +framework: beakerlib +require: + - anthy-unicode + - anthy-unicode-devel + - autoconf + - automake + - emacs + - fedpkg + - gcc + - git + - libtool + - make + - rpm-build diff --git a/tests/migration/test.sh b/tests/migration/test.sh new file mode 100755 index 0000000..a1bd50c --- /dev/null +++ b/tests/migration/test.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +[ -d $HOME/.anthy ] || mkdir $HOME/.anthy + +rlJournalStart + rlPhaseStartTest + rlRun -t "anthy-dic-tool-unicode --load /usr/share/anthy-unicode/dic-tool-input" + rlRun -t "diff $HOME/.config/anthy/private_words_default /usr/share/anthy-unicode/dic-tool-result" + rlRun -t "anthy-dic-tool-unicode --dump" + rlRun -t "mv $HOME/.config/anthy/private_words_default $HOME/.anthy" + rlRun -t "anthy-dic-tool-unicode --migrate" + rlRun -t "diff $HOME/.config/anthy/private_words_default /usr/share/anthy-unicode/dic-tool-result" + rlPhaseEnd +rlJournalEnd From 4f8244a770aa3e624bbdd562c044a532d0a5225e Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Fri, 16 Aug 2024 20:27:23 +0900 Subject: [PATCH 13/17] Revert to drop emacs.i686 Fixes: https://src.fedoraproject.org/rpms/anthy-unicode/c/41d0118?branch=rawhide --- anthy-unicode.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/anthy-unicode.spec b/anthy-unicode.spec index 0bfba64..587d7f2 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -7,12 +7,6 @@ %bcond_without xemacs %endif -# emacs.i686 has not been available since emacs-29.4-7.fc40 -%ifarch i686 -%bcond_with emacs -%else -%bcond_without emacs -%endif Name: anthy-unicode Version: 1.0.0.20240502 @@ -20,9 +14,7 @@ Release: %autorelease # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. License: LGPL-2.0-or-later AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain URL: https://github.com/fujiwarat/anthy-unicode/wiki -%if %{with emacs} BuildRequires: emacs -%endif BuildRequires: gcc BuildRequires: git %if %{with xemacs} @@ -53,7 +45,6 @@ user dictionaries and the users information which is used for the conversion, is stored into their own home directory. So Anthy Unicode is secure than other conversion server. -%if %{with emacs} %package -n emacs-%{pkg} Summary: Emacs files for %{pkg} Requires: %{name} = %{version}-%{release} @@ -63,7 +54,6 @@ BuildArch: noarch %description -n emacs-%{pkg} This package contains the byte compiled elips packages to run %{pkg} with GNU Emacs. -%endif %if %{with xemacs} %package -n xemacs-%{pkg} @@ -112,11 +102,9 @@ install -m 644 dic-tool-input $RPM_BUILD_ROOT%{_datadir}/%{pkg} install -m 644 dic-tool-result $RPM_BUILD_ROOT%{_datadir}/%{pkg} popd -%if %{with emacs} ## for emacs-anthy mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir} install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir} -%endif %if %{with xemacs} ## for xemacs-anthy @@ -165,14 +153,12 @@ cd .. %{_libdir}/lib*.so.* %{_datadir}/%{pkg}/ -%if %{with emacs} %files -n emacs-%{pkg} %doc doc/ELISP %{_emacs_sitelispdir}/%{pkg}/*.el %{_emacs_sitelispdir}/%{pkg}/*.elc %{_emacs_sitestartdir}/*.el %dir %{_emacs_sitelispdir}/%{pkg} -%endif %if %{with xemacs} %files -n xemacs-%{pkg} From 024c975b7d403c5362ef6416d63501b1e222eb92 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Sat, 17 Aug 2024 13:13:03 +0900 Subject: [PATCH 14/17] Delete unnecessary packages in CI --- tests/migration/main.fmf | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/migration/main.fmf b/tests/migration/main.fmf index 843d404..bc2c7a7 100644 --- a/tests/migration/main.fmf +++ b/tests/migration/main.fmf @@ -2,14 +2,4 @@ summary: Migration tests of private dicts from anthy to anthy-unicode test: ./test.sh framework: beakerlib require: - - anthy-unicode - anthy-unicode-devel - - autoconf - - automake - - emacs - - fedpkg - - gcc - - git - - libtool - - make - - rpm-build From 837491e30831903b1f447971c3c76318752bba0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:11:04 +0000 Subject: [PATCH 15/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 78c4063c6b76da9099b0d995bd88056b95e425da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:03:31 +0000 Subject: [PATCH 16/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 205160017748ea9b584ba24ac89348945e743305 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:44:44 +0000 Subject: [PATCH 17/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild