dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-28 10:02:22 +00:00 · 2009-11-26 01:27:53 +00:00 · 2009-05-11 09:45:39 +00:00 · 2009-02-10 12:23:23 +00:00 · 2009-02-10 12:18:17 +00:00 · 2008-06-27 10:11:26 +00:00
15 changed files with 145 additions and 101108 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -36,5 +36,4 @@ anthy-9100b.tar.gz
 alt-cannadic-070918.tar.bz2
 anthy-9100d.tar.gz
 anthy-9100e.tar.gz
-anthy-9100g.tar.gz
 anthy-9100h.tar.gz
--- a/anthy-aarch64.patch
+++ b/anthy-aarch64.patch
--- a/anthy-corpus.patch
+++ b/anthy-corpus.patch
--- a/anthy-fix-elisp.patch
+++ b/anthy-fix-elisp.patch
@ -1,12 +0,0 @@
-diff -pruN anthy-9100h.orig/src-util/anthy.el anthy-9100h/src-util/anthy.el
--- anthy-9100h.orig/src-util/anthy.el	2008-11-29 21:46:00.000000000 +0900
-+++ anthy-9100h/src-util/anthy.el	2013-03-08 18:49:51.000000000 +0900
-@@ -892,7 +892,7 @@
- 	 ((event-matches-key-specifier-p event 'backspace) 8)
- 	 (t
- 	  (char-to-int (event-to-character event)))))
-    last-command-char))
-+    last-command-event))
- 
- ;;
- ;;
--- a/anthy-fix-emacs29.patch
+++ b/anthy-fix-emacs29.patch
@ -1,12 +0,0 @@
-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)
- 
- ;;
--- a/anthy-fix-eol.patch
+++ b/anthy-fix-eol.patch
@ -1,12 +0,0 @@
-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;
- }
- 
--- a/anthy-fix-segfault.patch
+++ b/anthy-fix-segfault.patch
@ -1,14 +0,0 @@
-diff -pruN anthy-9100h.orig/src-diclib/xstr.c anthy-9100h/src-diclib/xstr.c
--- anthy-9100h.orig/src-diclib/xstr.c	2009-01-23 12:31:31.000000000 +0900
-+++ anthy-9100h/src-diclib/xstr.c	2013-06-17 19:30:08.000000000 +0900
-@@ -384,6 +384,10 @@ int
- anthy_xstrcmp(xstr *x1, xstr *x2)
- {
-   int i, m;
-+  if (!x1)
-+    return -1;
-+  if (!x2)
-+    return 1;
-   if (x1->len < x2->len) {
-     m = x1->len;
-   }else{
--- a/anthy-fix-typo-in-dict-name.patch
+++ b/anthy-fix-typo-in-dict-name.patch
@ -1,24 +0,0 @@
-diff -pruN anthy-9100h.orig/alt-cannadic/g_fname.t anthy-9100h/alt-cannadic/g_fname.t
--- anthy-9100h.orig/alt-cannadic/g_fname.t	2009-02-08 01:28:12.000000000 +0900
-+++ anthy-9100h/alt-cannadic/g_fname.t	2010-05-10 19:10:04.000000000 +0900
-@@ -82,7 +82,7 @@ あとうかい #JN*50 #_3阿藤_2海
- あとうだたかし #JN*100 #_4阿刀田_3高
- あなやまこすけ #JN*10 #_4穴山_3小介
- あびるゆう #JN*100 #_3あびる_2優
-あべこうぼう #JN*10 #_2阿部_4公房
-+あべこうぼう #JN*10 #_2安部_4公房
- あべしんぞう #JN*100 #_2安倍_4晋三
- あべせいめい #JN*50 #_2安倍_4晴明
- あべなつみ #JN*150 #_2安倍_3なつみ
-diff -pruN anthy-9100h.orig/mkworddic/name.t anthy-9100h/mkworddic/name.t
--- anthy-9100h.orig/mkworddic/name.t	2009-02-07 21:12:35.000000000 +0900
-+++ anthy-9100h/mkworddic/name.t	2010-05-10 19:10:37.000000000 +0900
-@@ -43,7 +43,7 @@
- <20><><EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #JN #_4<5F><34><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_3<5F><33>
- <20><><EFBFBD>ʤ<EFBFBD> #JN <20><><EFBFBD>ʥ<EFBFBD>
- <20><><EFBFBD>Ӥ<EFBFBD><D3A4>椦 #JN #_3<5F><33><EFBFBD>Ӥ<EFBFBD>_2ͥ
-<2D><><EFBFBD>٤<EFBFBD><D9A4><EFBFBD><EFBFBD>ܤ<EFBFBD> #JN #_2<5F><32><EFBFBD><EFBFBD>_4<5F><34>˼
-+<2B><><EFBFBD>٤<EFBFBD><D9A4><EFBFBD><EFBFBD>ܤ<EFBFBD> #JN #_2<5F><32><EFBFBD><EFBFBD>_4<5F><34>˼
- <20><><EFBFBD>٤<EFBFBD><D9A4>夷<EFBFBD>礦 #JN #_2<5F><32><EFBFBD><EFBFBD>_5<5F><35><EFBFBD><EFBFBD>
- <20><><EFBFBD>٤<EFBFBD><D9A4>󤾤<EFBFBD> #JN #_2<5F><32><EFBFBD><EFBFBD>_4<5F><34><EFBFBD><EFBFBD>
- <20><><EFBFBD>٤<EFBFBD><D9A4><EFBFBD><EFBFBD><EFBFBD> #JN #_2<5F><32><EFBFBD><EFBFBD>_3<5F><33><EFBFBD><EFBFBD>
--- a/anthy-fix-typo-in-dict.patch
+++ b/anthy-fix-typo-in-dict.patch
@ -1,237 +0,0 @@
-diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.t
--- anthy-9100h.orig/mkworddic/compound.t	2009-02-07 21:15:36.000000000 +0900
-+++ anthy-9100h/mkworddic/compound.t	2010-10-07 11:38:24.000000000 +0900
-@@ -8,7 +8,6 @@
- あいしゃせいしん #T35 #_4愛社_4精神
- あいしょうしんだん #T35 #_5相性_4診断
- あいしょうめい #T35 #_5愛称_2名
-あいずしっき #T35 #_3会津_3漆器
- あいぜんしゅたっと #CN アイゼンシュタット
- あいぞうげき #T35 #_4愛憎_2劇
- あいちいだい #T35 #_3愛知_3医大
-@@ -20,6 +19,7 @@
- あいちこうじょう #T35 #_3愛知_5工場
- あいちこうだい #T35 #_3愛知_4工大
- あいちしゅっしん #T35 #_3愛知_5出身
-+あいづしっき #T35 #_3会津_3漆器
- あいづだいがく #T35 #_3会津_4大学
- あいづてつどう #T35 #_3会津_4鉄道
- あいづてつどうせん #T35 #_3会津_6鉄道線
-@@ -1987,7 +1987,7 @@
- いっぱんよやくかいし #T35 #_4一般_3予約_3開始
- いっぱんりょく #T35 #_4一般_3力
- いっぱんりょこう #T35 #_4一般_4旅行
-いっぱんりよう #35 #_4一般_3利用
-+いっぱんりよう #T30 #_4一般_3利用
- いっぱんりようしゃ #T35 #_4一般_3利用_2者
- いっぱんりようしゃむき #T35 #_4一般_3利用_2者_2向
- いっぱんりろん #T35 #_4一般_3理論
-@@ -9714,7 +9714,6 @@
- かんじんずもう #T35 #_4勧進_3相撲
- かんじんちょう #T35 #_4勧進_3帳
- かんすいかしょ #T35 #_4冠水_3箇所
-かんすいきんぞく #T35 #_4関水_4金属
- かんすいぎょ #T35 #_4寒水_2魚
- かんすいばしょ #T35 #_4冠水_3場所
- かんすうかいせき #T35 #_4関数_4解析
-@@ -10235,7 +10234,7 @@
- かんぶじんじ #T35 #_3幹部_3人事
- かんぶつや #T35 #_4乾物_1屋
- かんぶり #T35 #_2寒_2ブリ
-かんぶりゅうしゅつ #T#5 #_3幹部_6流出
-+かんぶりゅうしゅつ #T30 #_3幹部_6流出
- かんぶんくんどくたい #T35 #_4漢文_4訓読_2体
- かんぶんてき #T35 #_4漢文_2的
- かんぷうげき #T35 #_4完封_2劇
-@@ -14320,7 +14319,7 @@
- きょうとしんぶん #KK #_4京都_4新聞
- きょうとしんぶんはい #T35 #_4京都_4新聞_2杯
- きょうとじゅう #T35 #_4京都_3中
-きょうとじゅうかんじどうしゃどう T35 #_4京都_5縦貫_5自動車_2道
-+きょうとじゅうかんじどうしゃどう #T35 #_4京都_5縦貫_5自動車_2道
- きょうとじん #T35 #_4京都_2人
- きょうとせらみっく #KK #_4京都_5セラミック
- きょうとたいしょうてん #T35 #_4京都_5大賞_2典
-@@ -19234,7 +19233,7 @@
- げんかんぐち #T35 #_4玄関_2口
- げんかんげんぞう #T35 #_2減_2感_4現像
- げんかんさき #T35 #_4玄関_2先
-げんかんしょうめい #T35 #_4玄関_5証明
-+げんかんしょうめい #T35 #_4玄関_5照明
- げんかんすう #T35 #_2原_4関数
- げんかんまえ #T35 #_4玄関_2前
- げんかんりにん #T35 #_2現_3管理_2人
-@@ -19964,7 +19963,7 @@
- げんりょうちょうたつ #T35 #_5原料_5調達
- げんろういん #T35 #_4元老_2院
- げんろくずし #T35 #_4元禄_2寿司
-げんろせん #T5 #_2現_3路線
-+げんろせん #T35 #_2現_3路線
- げんろんくうかん #T35 #_4言論_4空間
- げんろんじゆう #T35 #_4言論_3自由
- げんろんせいげん #T35 #_4言論_4制限
-@@ -20163,7 +20162,7 @@
- こうかいとうろん #T35 #_4公開_4討論
- こうかいなまほうそう #T35 #_4公開_2生_4放送
- こうかいはん #T35 #_4航海_2班
-こうかいはんてい #T35 #_4高階_4判定
-+こうかいはんてい #T35 #_4公開_4判定
- こうかいばん #T35 #_4公開_2版
- こうかいび #T35 #_4公開_1日
- こうかいほうそう #T35 #_4公開_4放送
-@@ -21650,7 +21649,7 @@
- こうていは #T35 #_4肯定_1派
- こうてきかいごほけん #T35 #_4公的_3介護_3保険
- こうてきかんきん #T35 #_4公的_4換金
-こうてきかんよ T35 #_4公的_3関与
-+こうてきかんよ #T30 #_4公的_3関与
- こうてききかん #T35 #_4公的_3機関
- こうてききせい #T35 #_4公的_3規制
- こうてききんゆう #T35 #_4公的_4金融
-@@ -30752,7 +30751,6 @@
- しゅんじゅうせんごくじだい #T35 #_6春秋_4戦国_3時代
- しゅんじゅうのま #T35 #_7春秋の_1間
- しゅんていたいさく #T35 #_5瞬停_4対策
-しゅんとうぐん #T35 #_5駿東_2郡
- しゅんぱつりょく #T35 #_5瞬発_3力
- しゅんぱつりょくしょうぶ #T35 #_5瞬発_3力_4勝負
- しゅんびんせい #T35 #_5俊敏_2性
-@@ -30839,7 +30837,7 @@
- しょうかへい #T35 #_3小_3花柄
- しょうかぼう #T35 #_4裳華_2房
- しょうかよういん #T35 #_4消化_4要員
-しょうかようすい #T35 #_4消化_4用水
-+しょうかようすい #T35 #_4消火_4用水
- しょうかりょく #T35 #_4消化_3力
- しょうかんきかん #T35 #_5償還_3期間
- しょうかんきげん #T35 #_5償還_3期限
-@@ -40405,6 +40403,7 @@
- せきしょくとう #T35 #_5赤色_2灯
- せきじひょう #T35 #_3席次_3表
- せきじゅうじき #T35 #_6赤十字_1旗
-+せきすいきんぞく #KK #_4関水_4金属
- せきずいしょう #T35 #_4脊髄_3症
- せきずいそんしょう #T35 #_4脊髄_5損傷
- せきずいはんしゃ #T35 #_4脊髄_4反射
-@@ -40670,7 +40669,7 @@
- せっちゃくざい #T35 #_5接着_2剤
- せっちゃくざい #T35 #_5接着_2材
- せっちゃくぶ #T35 #_5接着_1部
-せっちゃくぶぶん T35 #_5接着_3部分
-+せっちゃくぶぶん #T35 #_5接着_3部分
- せっちゃくめん #T35 #_5接着_2面
- せっちゃくめんせき #T35 #_5接着_4面積
- せっちゅうあん #T35 #_5折衷_2案
-@@ -41942,7 +41941,7 @@
- ぜんきょくすう #T35 #_5全曲_2数
- ぜんきょくちゅう #T35 #_5全曲_3中
- ぜんきょくばん #T35 #_5全曲_2版
-ぜんきょくろくおん #T35 #_5歩道_4整備
-+ぜんきょくろくおん #T30 #_5全曲_4録音
- ぜんきんあんていせい #T35 #_4漸近_6安定性
- ぜんきんせん #T35 #_4漸近_2線
- ぜんきんせんじょう #T35 #_6漸近線_3上
-@@ -46498,7 +46497,7 @@
- ちゅうばちけん #KK #_5中鉢_2研
- ちゅうばんいこう #T35 #_5中盤_3以降
- ちゅうばんいじょう #T35 #_5中判_4以上
-ちゅうぶじゅうかんじどうしゃどう T35 #_4中部_5縦貫_5自動車_2道
-+ちゅうぶじゅうかんじどうしゃどう #T35 #_4中部_5縦貫_5自動車_2道
- ちゅうぶぜい #T35 #_4中部_2勢
- ちゅうぶちく #T35 #_4中部_2地区
- ちゅうぶちほう #T35 #_4中部_3地方
-@@ -57562,11 +57561,11 @@
- ひなんごや #T35 #_3避難_2小屋
- ひなんさき #T35 #_3避難_2先
- ひなんしえん #T35 #_3避難_3支援
-ひなんじゃくしゃ #T35 #_3非難_5弱者
-+ひなんじゃくしゃ #T35 #_3避難_5弱者
- ひなんじゅうみん #T35 #_3避難_5住民
- ひなんじょ #T35 #_3避難_2所
- ひなんせいかつ #T35 #_3避難_4生活
-ひなんたいろ #T35 #_3非難_3退路
-+ひなんたいろ #T35 #_3避難_3退路
- ひなんつうろ #T35 #_3避難_3通路
- ひなんばしょ #T35 #_3避難_3場所
- ひなんゆうどう #T35 #_3避難_4誘導
-@@ -62585,6 +62584,7 @@
- ほとけさま #T35 #_3仏_2様
- ほどうがわ #T35 #_3歩道_2側
- ほどうじょう #T35 #_3歩道_3上
-+ほどうせいび #T30 #_3歩道_3整備
- ほどうれき #T35 #_3補導_2歴
- ほにゅうどうぶつ #T35 #_4哺乳_4動物
- ほにゅうびん #T35 #_4哺乳_2瓶
-@@ -66264,7 +66264,6 @@
- ゆそうき #T35 #_3輸送_1機
- ゆそうきかん #T35 #_3輸送_3機関
- ゆそうきち #T35 #_3輸送_2基地
-ゆそうきど #T35 #_3輸送_2輝度
- ゆそうきょり #T35 #_3輸送_3距離
- ゆそうぎょうしゃ #T35 #_3輸送_5業者
- ゆそうけいかく #T35 #_3輸送_4計画
-@@ -66351,7 +66350,7 @@
- ゆびさしかくにん #T35 #_4指差し_4確認
- ゆびもじ #T35 #_2指_2文字
- ゆびわものがたり #T35 #_3指輪_5物語
-ゆまくいじょう #T35 #_3油膜_4以上
-+ゆまくいじょう #T35 #_3油膜_4異常
- ゆまくけいせいりょく #T35 #_3油膜_4形成_3力
- ゆむらおんせん #T35 #_3湯村_4温泉
- ゆめかかく #T35 #_2夢_3価格
-diff -pruN anthy-9100h.orig/mkworddic/udict anthy-9100h/mkworddic/udict
--- anthy-9100h.orig/mkworddic/udict	2009-01-27 21:26:33.000000000 +0900
-+++ anthy-9100h/mkworddic/udict	2010-10-07 11:40:18.000000000 +0900
-@@ -378,7 +378,7 @@
- -------------------
- き () #KS 着
- ふく () #T35 服
-ようふく () T35 洋服
-+ようふく () #T35 洋服
- きもの () #T35 着物
- うちゅうふく () #T35 宇宙服
- せんすいふく () #T35 潜水服
-@@ -494,7 +494,7 @@
- # 原点
- げんてん () #T35 原典
- よ (む) #M5r 読
-しゅぎ () T35 主義
-+しゅぎ () #T35 主義
- -------------------
- # 効果
- こうか () #T05 高価
-@@ -767,10 +767,10 @@
- れじ () #T35 レジ
- -------------------
- #成長
-せいちょう () T30 成長
-きぎょう () T35 企業
-えんじにあ () T35 エンジニア
-ひと () T35 人
-+せいちょう () #T30 成長
-+きぎょう () #T35 企業
-+えんじにあ () #T35 エンジニア
-+ひと () #T35 人
- -------------------
- # 制度
- せいど () #T35 精度
-@@ -1191,7 +1191,7 @@
- ぶっきょう () #T35 仏教
- ぶっきょうと () #T35 仏教徒
- いきょうと () #T35 異教徒
-しゅうきょう () T35 宗教
-+しゅうきょう () #T35 宗教
- -------------------
- #回収
- かいしゅう () #T30 回収
-@@ -1250,8 +1250,8 @@
- -------------------
- #伝道
- でんどう () #T30 伝道
-しゅうきょう () T35 宗教
-きりすときょう () T35 キリスト教
-+しゅうきょう () #T35 宗教
-+きりすときょう () #T35 キリスト教
- きりすときょう () #T35 キリスト教
- きりすときょうと () #T35 キリスト教徒
- いすらむきょう () #T35 イスラム教
--- a/anthy.spec
+++ b/anthy.spec
@ -1,85 +1,118 @@
-%global use_utf8_dict 1
-%global pkg  anthy
+%define	use_utf8_dict	1
+%define	pkg		anthy

-%if 0%{?rhel} == 0 && 0%{?fedora} < 36
-%bcond_without xemacs
+%if %($(pkg-config emacs); echo $?)
+%define	emacs_version	22.1
+%define	emacs_lispdir	%{_datadir}/emacs/site-lisp
+%define	emacs_startdir	%{_datadir}/emacs/site-lisp/site-start.d
 %else
-# xemacs disabled on RHEL and Fedora 36+
-%bcond_with xemacs
+%define	emacs_version	%(pkg-config emacs --modversion)
+%define	emacs_lispdir	%(pkg-config emacs --variable sitepkglispdir)
+%define	emacs_startdir	%(pkg-config emacs --variable sitestartdir)
 %endif

-Name:  anthy
-Version: 9100h
-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/
-BuildRequires: emacs
-BuildRequires: gcc
-%if %{with xemacs}
-BuildRequires: xemacs
-BuildRequires: make
+%if %($(pkg-config xemacs); echo $?)
+%define	xemacs_version	21.5
+%define	xemacs_lispdir	%{_datadir}/xemacs/site-packages
+%define	xemacs_startdir	%{_datadir}/emacs/site-packages/site-start.d
+%else
+%define	xemacs_version	%(pkg-config xemacs --modversion)
+%define	xemacs_lispdir	%(pkg-config xemacs --variable sitepkglispdir)
+%define	xemacs_startdir	%(pkg-config xemacs --variable sitestartdir)
 %endif

-Source0: http://osdn.dl.sourceforge.jp/anthy/37536/anthy-%{version}.tar.gz
-Source1: %{name}-init.el
-Patch0:  %{name}-fix-typo-in-dict.patch
-Patch1:  %{name}-fix-typo-in-dict-name.patch
-Patch10: %{name}-corpus.patch
-Patch11: %{name}-fix-elisp.patch
-Patch12: %{name}-aarch64.patch
-Patch13: %{name}-fix-segfault.patch
-Patch14: %{name}-fix-emacs29.patch
-Patch15: %{name}-fix-eol.patch
+Name:		anthy
+Version:	9100h
+Release:	4%{?dist}
+# The entire source code is LGPLv2+ and dictionaries is GPLv2.
+License:	LGPLv2+ and GPLv2
+URL:		http://sourceforge.jp/projects/anthy/
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	emacs emacs-el
+BuildRequires:	xemacs

-Summary: Japanese character set input library
-Requires: emacs-filesystem >= %{_emacs_version}
-Provides: emacs-%{pkg}-el <= 9100h-27, emacs-%{pkg} <= 9100h-27
-Obsoletes: emacs-%{pkg}-el <= 9100h-27, emacs-%{pkg} <= 9100h-27
-%if %{with xemacs}
-Requires: xemacs-filesystem >= %{_xemacs_version}
-Provides: xemacs-%{pkg}-el <= 9100h-27, xemacs-%{pkg} <= 9100h-27
-Obsoletes: xemacs-%{pkg}-el <= 9100h-27, xemacs-%{pkg} <= 9100h-27
-%endif
+Source0:	http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
+Source1:	anthy-init.el

+Summary:	Japanese character set input library
+Group:		System Environment/Libraries
+Obsoletes:	anthy-libs
+Provides:	anthy-libs = %{version}
 %description
 Anthy provides the library to input Japanese on the applications, such as
 X applications and emacs. and the user dictionaries and the users information
 which is used for the conversion, is stored into their own home directory.
 So Anthy is secure than other conversion server.

-%package devel
-Summary: Header files and library for developing programs which uses Anthy
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pkgconfig
-
-%description devel
+%package	devel
+Summary:	Header files and library for developing programs which uses Anthy
+Group:		Development/Libraries
+Requires:	anthy = %{version}-%{release}
+Requires:	pkgconfig
+%description	devel
 The anthy-devel package contains the development files which is needed to build
 the programs which uses Anthy.

+%package -n	emacs-%{pkg}
+Summary:	Compiled elisp files to run Anthy under GNU Emacs
+Group:		System Environment/Libraries
+Requires:	emacs(bin) >= %{emacs_version}
+Requires:	anthy = %{version}-%{release}
+Obsoletes:	anthy-el < 9100g-1
+Provides:	anthy-el = %{version}-%{release}
+
+%description -n	emacs-%{pkg}
+This package contains the byte compiled elisp packages to run Anthy with GNU
+Emacs.
+
+%package -n	emacs-%{pkg}-el
+Summary:	Elisp source files for Anthy under GNU Emacs
+Group:		System Environment/Libraries
+Requires:	emacs-%{pkg} = %{version}-%{release}
+
+%description -n	emacs-%{pkg}-el
+This package contains the elisp source files for Anthy under GNU Emacs. You
+do not need to install this package to run Anthy. Install the emacs-%{pkg}
+package to use Anthy with GNU Emacs.
+
+%package -n	xemacs-%{pkg}
+Summary:	Compiled elisp files to run Anthy under XEmacs
+Group:		System Environment/Libraries
+Requires:	xemacs(bin) >= %{xemacs_version}
+Requires:	anthy = %{version}-%{release}
+Obsoletes:	anthy-el-xemacs < 9100g-1
+Provides:	anthy-el-xemacs = %{version}-%{release}
+
+%description -n	xemacs-%{pkg}
+This package contains the byte compiled elisp packages to use Anthy with
+XEmacs.
+
+%package -n	xemacs-%{pkg}-el
+Summary:	Elisp source files for Anthy under XEmacs
+Group:		System Environment/Libraries
+Requires:	xemacs-%{pkg} = %{version}-%{release}
+
+%description -n	xemacs-%{pkg}-el
+This package contains the elisp source files for Anthy under XEmacs. You do
+not need to install this package to run Anthy. Install the xemacs-%{pkg}
+package to use Anthy with XEmacs.
+

 %prep
-%autosetup -p1
+%setup -q #-a 2

-# Convert to utf-8
-for file in ChangeLog doc/protocol.txt; do
-    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
-    touch -r $file $file.new && \
-    mv $file.new $file
-done
-
-%if %{use_utf8_dict}
+%if	%{use_utf8_dict}
 function normalize_extra_dict() {
- sed -e 's/^\([^  ]*\)t[  ]*\(#[A-Z0-9\*]*\)[  ]*\([^  ]*\)$/\1 \2 \3/g' $1 > $1.norm
+	sed -e 's/^\([^ 	]*\)t[ 	]*\(#[A-Z0-9\*]*\)[ 	]*\([^ 	]*\)$/\1 \2 \3/g' $1 > $1.norm
 }
 function dict_conv() {
- iconv -f euc-jp -t utf-8 $1 > $1.utf8
+	iconv -f euc-jp -t utf-8 $1 > $1.utf8
 }
 function gen_dict_args() {
- if ! test -f $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in-orig; then
-  cp -a $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in{,-orig}
- fi
- cat <<_EOF_ > $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in
+	if ! test -f $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in-orig; then
+		cp -a $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in{,-orig}
+	fi
+	cat <<_EOF_ >> $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in
 # Generated by rpm script
 set_input_encoding utf8
 read @top_srcdir@/alt-cannadic/gcanna.ctd.utf8
@ -93,11 +126,12 @@ read @top_srcdir@/alt-cannadic/extra/gf-fuzoku-34.t.norm
 read @top_srcdir@/mkworddic/adjust.t.utf8
 read @top_srcdir@/mkworddic/compound.t.utf8
 read @top_srcdir@/mkworddic/extra.t.utf8
+read @top_srcdir@/mkworddic/utf8.t
 read @top_srcdir@/alt-cannadic/g_fname.t
 #
 build_reverse_dict
 set_dict_encoding utf8
-read_uc @top_srcdir@/mkworddic/udict.utf8
+read_uc @top_srcdir@/mkworddic/udict
 write anthy.wdic
 done
 _EOF_
@ -105,19 +139,19 @@ touch -r $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in{-orig,}
 }

 (
- cd alt-cannadic
- for i in gcanna.ctd gcannaf.ctd gtankan.ctd; do
-  dict_conv $i
- done
- cd extra
- for i in g-jiritu-34.t gc-fullname-34.t gf-fuzoku-34.t gt-tankanji_hikanji-34.t gt-tankanji_kanji-34.t; do
-  normalize_extra_dict $i
- done
+	cd alt-cannadic
+	for i in gcanna.ctd gcannaf.ctd gtankan.ctd; do
+		dict_conv $i
+	done
+	cd extra
+	for i in g-jiritu-34.t gc-fullname-34.t gf-fuzoku-34.t gt-tankanji_hikanji-34.t gt-tankanji_kanji-34.t; do
+		normalize_extra_dict $i
+	done
 );(
- cd mkworddic
- for i in adjust.t compound.t extra.t udict zipcode.t; do
-  dict_conv $i
- done
+	cd mkworddic
+	for i in adjust.t compound.t extra.t udict zipcode.t; do
+		dict_conv $i
+	done
 )
 gen_dict_args
 %endif
@ -130,229 +164,72 @@ sed -ie 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTO
 LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags}

 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT

 # remove unnecessary files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{la,a}

 ## for emacs-anthy
-mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+%__mkdir_p $RPM_BUILD_ROOT%{emacs_startdir}
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}

-%if %{with xemacs}
 ## for xemacs-anthy
-mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
+%__mkdir_p $RPM_BUILD_ROOT%{xemacs_startdir}
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{xemacs_startdir}
 pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util
 make clean
-make EMACS=xemacs lispdir="%{_xemacs_sitelispdir}/%{pkg}"
-make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{_xemacs_sitelispdir}/%{pkg}" INSTALL="install -p"
+make EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
+make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
 popd
-%endif

-%ldconfig_scriptlets
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig

 %files
-%doc AUTHORS ChangeLog DIARY NEWS README
-%license COPYING
+%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog DIARY NEWS README
 %{_bindir}/*
 %{_sysconfdir}/*
 %{_libdir}/lib*.so.*
 %{_datadir}/anthy/
-%doc doc/ELISP
-%{_emacs_sitelispdir}/%{pkg}/*.el
-%{_emacs_sitelispdir}/%{pkg}/*.elc
-%{_emacs_sitestartdir}/*.el
-%dir %{_emacs_sitelispdir}/%{pkg}
-%if %{with xemacs}
-%{_xemacs_sitelispdir}/%{pkg}/*.el
-%{_xemacs_sitelispdir}/%{pkg}/*.elc
-%{_xemacs_sitestartdir}/*.el
-%dir %{_xemacs_sitelispdir}/%{pkg}
-%endif

 %files devel
+%defattr (-, root, root, -)
 %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
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc

+%files -n emacs-%{pkg}
+%defattr(-, root, root, -)
+%doc doc/ELISP
+%{emacs_lispdir}/%{pkg}/*.elc
+%{emacs_startdir}/*.el
+%dir %{emacs_lispdir}/%{pkg}
+
+%files -n emacs-%{pkg}-el
+%defattr(-, root, root, -)
+%{emacs_lispdir}/%{pkg}/*.el
+
+%files -n xemacs-%{pkg}
+%defattr(-, root, root, -)
+%doc doc/ELISP
+%{xemacs_lispdir}/%{pkg}/*.elc
+%{xemacs_startdir}/*.el
+%dir %{xemacs_lispdir}/%{pkg}
+
+%files -n xemacs-%{pkg}-el
+%defattr(-, root, root, -)
+%{xemacs_lispdir}/%{pkg}/*.el
+

 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-59
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-58
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-57
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Sep 19 2024 Akira TAGOH <tagoh@redhat.com> - 9100h-56
- Fix an infinite loop when missing EOL in record file.
-  Resolves: rhbz#1944546
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-55
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-54
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-53
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Nov 28 2023 Akira TAGOH <tagoh@redhat.com> - 9100h-52
- Fix symbol error on Emacs 29.
-  Resolves: rhbz#2251128
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-51
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-50
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Nov 30 2022 Akira TAGOH <tagoh@redhat.com> - 9100h-49
- Convert License tag to SPDX.
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue May 31 2022 Stewart Smith <trawets@amazon.com> - 9100h-46
- Switch xemacs build condition to bcond
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Nov  9 2021 Jerry James <loganjerry@gmail.com> - 9100h-44
- Drop XEmacs support in F36 and later
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-41
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 29 2018 Akira TAGOH <tagoh@redhat.com> - 9100h-35
- Use ldconfig rpm macro.
-
-* Mon Feb 19 2018 Akira TAGOH <tagoh@redhat.com>  - 9100h-34
- Add BR: gcc.
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 9100h-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jan  4 2016 Akira TAGOH <tagoh@redhat.com>
- Use %%global instead of %%define.
-
-* Tue Jun 23 2015 Akira TAGOH <tagoh@redhat.com> - 9100h-28
- Merge emacs sub-packages into main (#1234577)
-
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9100h-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9100h-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9100h-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9100h-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Jun 17 2013 Akira TAGOH <tagoh@redhat.com> - 9100h-23
- Fix a segfault issue. (#973127)
-
-* Wed Mar 27 2013 Akira TAGOH <tagoh@redhat.com> - 9100h-22
- Rebuilt for aarch64 support (#925002)
-
-* Fri Mar  8 2013 Akira TAGOH <tagoh@redhat.com> - 9100h-21
- Apply a patch from Mike FABIAN to get anthy.el working back on Emacs 24.3.1.
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9100h-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Aug 14 2012 Akira TAGOH <tagoh@redhat.com> - 9100h-19
- Update License tag.
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9100h-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9100h-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9100h-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Oct  7 2010 Akira TAGOH <tagoh@redhat.com> - 9100h-15
- Fix a typo in the dictionary. (#629908)
-
-* Mon Sep 27 2010 Akira TAGOH <tagoh@redhat.com> - 9100h-14
- spec file clean up (Parag AN, #552855)
-
-* Thu Jun 24 2010 Akira TAGOH <tagoh@redhat.com> - 9100h-13
- build emacs-* packages as noarch.
-
-* Mon May 10 2010 Akira TAGOH <tagoh@redhat.com> - 9100h-12
- Fix a typo in g_fname.t. (#584614)
-
-* Mon Mar 15 2010 Akira TAGOH <tagoh@redhat.com> - 9100h-11
- enable UTF-8 dictionaries really.
-
-* Sun Mar 14 2010 Jonathan G. Underwood <jonathan.underwood@gmail.com>
- Update spec file to comply with Emacs add-on packaging guidelines (#573449)
-
-* Mon Dec 21 2009 Akira TAGOH <tagoh@redhat.com> - 9100h-10
- Fix more typos in dictionary. (#548078)
- correct the source URL.
-
-* Thu Sep  3 2009 Dennis Gregorovic <dgregor@redhat.com> - 9100h-9
- Do not build against xemacs on RHEL
-
-* Fri Aug 28 2009 Akira TAGOH <tagoh@redhat.com> - 9100h-8
- Fix more typos in dictionary. (#519769)
-
-* Thu Aug 20 2009 Akira TAGOH <tagoh@redhat.com> - 9100h-7
- Stop updating corpus at the build time to avoid creating different dictionary
-  among arch. (#816563)
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9100h-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jul  8 2009 Akira TAGOH <tagoh@redhat.com> - 9100h-5
- Update the corpus.
- Fix typos in dictionary. (#509534)
-
 * Mon May 11 2009 Akira TAGOH <tagoh@redhat.com> - 9100h-4
 - Take off the ownership of %%{_libdir}/pkgconfig. (#499663)
 - Add R: pkgconfig to -devel.
@ -579,3 +456,4 @@ popd

 * Tue Jun 01 2004 Akira TAGOH <tagoh@redhat.com> 5330-1
 - Initial package.
+
--- a/plans/basic.fmf
+++ b/plans/basic.fmf
@ -1,5 +0,0 @@
-summary: Basic smoke test
-discover:
-    how: fmf
-execute:
-    how: tmt
--- a/tests/basic/main.fmf
+++ b/tests/basic/main.fmf
@ -1,5 +0,0 @@
-summary: Basic test for anthy
-require:
-  - anthy
-test: ./test.sh
-framework: beakerlib
--- a/tests/basic/test.sh
+++ b/tests/basic/test.sh
@ -1,14 +0,0 @@
-#!/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
--- a/tests/basic/word.txt
+++ b/tests/basic/word.txt
@ -1,8 +0,0 @@
-てすと 1 テスト
-格助詞接続	=	y
-語幹のみで文節	=	y
-する接続	=	y
-さ接続	=	y
-な接続	=	y
-品詞	=	名詞
-
Author	SHA1	Message	Date
Fedora Release Engineering	2b47ae9cd6	dist-git conversion	2010-07-28 10:02:22 +00:00
Bill Nottingham	5a90f6439b	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:27:53 +00:00
Akira TAGOH	2277854ebf	- Take off the ownership of %%{_libdir}/pkgconfig. (#499663 ) - Add R: pkgconfig to -devel.	2009-05-11 09:45:39 +00:00
Akira TAGOH	57e9d685bc	* empty log message *	2009-02-10 12:23:23 +00:00
Akira TAGOH	790b624c9c	- New upstream release.	2009-02-10 12:18:17 +00:00
Akira TAGOH	db5ad5eec8	- Fix a segfault with some words containing vu. (#452779 )	2008-06-27 10:11:26 +00:00
Jesse Keating	ad61247b36	Initialize branch F-9 for anthy	2008-04-20 12:17:53 +00:00