From 30f5548356cdb1d1c53941ba9a4fcde7fd7745e6 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 22:39:55 +0000
Subject: [PATCH 01/63] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 089fda7..7457a53 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: anthy
-# $Id: Makefile,v 1.1 2005/07/29 05:34:35 tagoh Exp $
+# $Id: Makefile,v 1.2 2007/10/15 18:35:48 notting Exp $
 NAME := anthy
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From a295343c71a595066112285971aec1816b5f21f8 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Mon, 21 Dec 2009 05:04:01 +0000
Subject: [PATCH 02/63] - Fix more typos in dictionary. (#548078) - correct the
 source URL.

---
 anthy-fix-typo-in-dict.patch | 65 +++++++++++++++++++++++++++++++++++-
 anthy.spec                   |  8 +++--
 2 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/anthy-fix-typo-in-dict.patch b/anthy-fix-typo-in-dict.patch
index 93c9555..0d6a4f3 100644
--- a/anthy-fix-typo-in-dict.patch
+++ b/anthy-fix-typo-in-dict.patch
@@ -1,6 +1,6 @@
 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	2009-08-28 17:19:20.000000000 +0900
++++ anthy-9100h/mkworddic/compound.t	2009-12-21 13:59:13.000000000 +0900
 @@ -8,7 +8,6 @@
  あいしゃせいしん #T35 #_4愛社_4精神
  あいしょうしんだん #T35 #_5相性_4診断
@@ -17,6 +17,15 @@ diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.
  あいづだいがく #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帳
@@ -25,6 +34,24 @@ diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.
  かんすいぎょ #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現像
@@ -34,6 +61,15 @@ diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.
  げんかんすう #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放送
@@ -43,6 +79,15 @@ diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.
  こうかいばん #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間
@@ -68,6 +113,15 @@ diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.
  せきずいしょう #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中
@@ -77,6 +131,15 @@ diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.
  ぜんきんあんていせい #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先
diff --git a/anthy.spec b/anthy.spec
index a5b67ce..b0eabe8 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -23,7 +23,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	9%{?dist}
+Release:	10%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -33,7 +33,7 @@ BuildRequires:	emacs emacs-el
 BuildRequires:	xemacs
 %endif
 
-Source0:	http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
+Source0:	http://osdn.dl.sourceforge.jp/anthy/37536/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Patch0:		anthy-fix-typo-in-dict.patch
 Patch1:		anthy-corpus.patch
@@ -245,6 +245,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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
 

From a1b00f554128b5a6aa0bde732cc12818438aa3f4 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Mon, 15 Mar 2010 02:55:13 +0000
Subject: [PATCH 03/63] - Update spec file to comply with Emacs add-on
 packaging guidelines     (#573449)

---
 anthy.spec | 59 +++++++++++++++++++-----------------------------------
 1 file changed, 21 insertions(+), 38 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index b0eabe8..99dc7ff 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -1,34 +1,14 @@
 %define	use_utf8_dict	1
 %define	pkg		anthy
 
-%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
-%define	emacs_version	%(pkg-config emacs --modversion)
-%define	emacs_lispdir	%(pkg-config emacs --variable sitepkglispdir)
-%define	emacs_startdir	%(pkg-config emacs --variable sitestartdir)
-%endif
-
-%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
-
 Name:		anthy
 Version:	9100h
-Release:	10%{?dist}
+Release:	11%{?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:	emacs
 %if 0%{?rhel} == 0
 BuildRequires:	xemacs
 %endif
@@ -60,7 +40,7 @@ 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:	emacs(bin) >= %{_emacs_version}
 Requires:	anthy = %{version}-%{release}
 Obsoletes:	anthy-el < 9100g-1
 Provides:	anthy-el = %{version}-%{release}
@@ -83,7 +63,7 @@ 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:	xemacs(bin) >= %{_xemacs_version}
 Requires:	anthy = %{version}-%{release}
 Obsoletes:	anthy-el-xemacs < 9100g-1
 Provides:	anthy-el-xemacs = %{version}-%{release}
@@ -184,17 +164,17 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{la,a}
 
 ## for emacs-anthy
-%__mkdir_p $RPM_BUILD_ROOT%{emacs_startdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}
+%__mkdir_p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
 %if 0%{?rhel} == 0
 ## for xemacs-anthy
-%__mkdir_p $RPM_BUILD_ROOT%{xemacs_startdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{xemacs_startdir}
+%__mkdir_p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util
 make clean
-make EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
-make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
+make EMACS=xemacs lispdir="%{_xemacs_sitelispdir}/%{pkg}"
+make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{_xemacs_sitelispdir}/%{pkg}"
 popd
 %endif
 
@@ -223,28 +203,31 @@ rm -rf $RPM_BUILD_ROOT
 %files -n emacs-%{pkg}
 %defattr(-, root, root, -)
 %doc doc/ELISP
-%{emacs_lispdir}/%{pkg}/*.elc
-%{emacs_startdir}/*.el
-%dir %{emacs_lispdir}/%{pkg}
+%{_emacs_sitelispdir}/%{pkg}/*.elc
+%{_emacs_sitestartdir}/*.el
+%dir %{_emacs_sitelispdir}/%{pkg}
 
 %files -n emacs-%{pkg}-el
 %defattr(-, root, root, -)
-%{emacs_lispdir}/%{pkg}/*.el
+%{_emacs_sitelispdir}/%{pkg}/*.el
 
 %if 0%{?rhel} == 0
 %files -n xemacs-%{pkg}
 %defattr(-, root, root, -)
 %doc doc/ELISP
-%{xemacs_lispdir}/%{pkg}/*.elc
-%{xemacs_startdir}/*.el
-%dir %{xemacs_lispdir}/%{pkg}
+%{_xemacs_sitelispdir}/%{pkg}/*.elc
+%{_xemacs_sitestartdir}/*.el
+%dir %{_xemacs_sitelispdir}/%{pkg}
 
 %files -n xemacs-%{pkg}-el
 %defattr(-, root, root, -)
-%{xemacs_lispdir}/%{pkg}/*.el
+%{_xemacs_sitelispdir}/%{pkg}/*.el
 %endif
 
 %changelog
+* Sun Mar 14 2010 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 9100h-11
+- 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.

From 9f60704b6fd223c712e64b2224fe916c01ac87ab Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Mon, 15 Mar 2010 07:43:36 +0000
Subject: [PATCH 04/63] - enable UTF-8 dictionaries really.

---
 anthy.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 99dc7ff..1223fb1 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -100,7 +100,7 @@ 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
+	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
@@ -118,7 +118,7 @@ read @top_srcdir@/alt-cannadic/g_fname.t
 #
 build_reverse_dict
 set_dict_encoding utf8
-read_uc @top_srcdir@/mkworddic/udict
+read_uc @top_srcdir@/mkworddic/udict.utf8
 write anthy.wdic
 done
 _EOF_
@@ -225,7 +225,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Sun Mar 14 2010 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 9100h-11
+* 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

From 5a900eef6f08d888ccb9f08a8fc198846b9dab43 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Mon, 10 May 2010 10:57:01 +0000
Subject: [PATCH 05/63] - Fix a typo in g_fname.t. (#584614)

---
 anthy-fix-typo-in-dict-name.patch | 24 ++++++++++++++++++++++++
 anthy.spec                        | 11 ++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 anthy-fix-typo-in-dict-name.patch

diff --git a/anthy-fix-typo-in-dict-name.patch b/anthy-fix-typo-in-dict-name.patch
new file mode 100644
index 0000000..2025149
--- /dev/null
+++ b/anthy-fix-typo-in-dict-name.patch
@@ -0,0 +1,24 @@
+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 @@
+ あとうだたかし #JN #_4阿刀田_3高
+ あなん #JN アナン
+ あびるゆう #JN #_3あびる_2優
+-あべこうぼう #JN #_2阿部_4公房
++あべこうぼう #JN #_2安部_4公房
+ あべしゅしょう #JN #_2安倍_5首相
+ あべしんぞう #JN #_2安倍_4晋三
+ あべそうり #JN #_2安倍_3総理
diff --git a/anthy.spec b/anthy.spec
index 1223fb1..a55a4f1 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	11%{?dist}
+Release:	12%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -16,7 +16,8 @@ BuildRequires:	xemacs
 Source0:	http://osdn.dl.sourceforge.jp/anthy/37536/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Patch0:		anthy-fix-typo-in-dict.patch
-Patch1:		anthy-corpus.patch
+Patch1:		anthy-fix-typo-in-dict-name.patch
+Patch10:	anthy-corpus.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -87,7 +88,8 @@ package to use Anthy with XEmacs.
 %prep
 %setup -q #-a 2
 %patch0 -p1 -b .0-typo
-%patch1 -p1 -b .1-corpus
+%patch1 -p1 -b .1-typo-name
+%patch10 -p1 -b .10-corpus
 
 %if	%{use_utf8_dict}
 function normalize_extra_dict() {
@@ -225,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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.
 

From 0a0d1757b4b422e419fb94a0f8255ee1a2fc7265 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Thu, 24 Jun 2010 06:40:02 +0000
Subject: [PATCH 06/63] - build emacs-* packages as noarch.

---
 anthy.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index a55a4f1..2984192 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	12%{?dist}
+Release:	13%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -45,6 +45,7 @@ Requires:	emacs(bin) >= %{_emacs_version}
 Requires:	anthy = %{version}-%{release}
 Obsoletes:	anthy-el < 9100g-1
 Provides:	anthy-el = %{version}-%{release}
+BuildArch:	noarch
 
 %description -n	emacs-%{pkg}
 This package contains the byte compiled elisp packages to run Anthy with GNU
@@ -54,6 +55,7 @@ Emacs.
 Summary:	Elisp source files for Anthy under GNU Emacs
 Group:		System Environment/Libraries
 Requires:	emacs-%{pkg} = %{version}-%{release}
+BuildArch:	noarch
 
 %description -n	emacs-%{pkg}-el
 This package contains the elisp source files for Anthy under GNU Emacs. You
@@ -68,6 +70,7 @@ Requires:	xemacs(bin) >= %{_xemacs_version}
 Requires:	anthy = %{version}-%{release}
 Obsoletes:	anthy-el-xemacs < 9100g-1
 Provides:	anthy-el-xemacs = %{version}-%{release}
+BuildArch:	noarch
 
 %description -n	xemacs-%{pkg}
 This package contains the byte compiled elisp packages to use Anthy with
@@ -77,6 +80,7 @@ XEmacs.
 Summary:	Elisp source files for Anthy under XEmacs
 Group:		System Environment/Libraries
 Requires:	xemacs-%{pkg} = %{version}-%{release}
+BuildArch:	noarch
 
 %description -n	xemacs-%{pkg}-el
 This package contains the elisp source files for Anthy under XEmacs. You do
@@ -227,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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)
 

From ea100c2800480677eb7c6dc7ec48738bcaadec2b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 10:02:18 +0000
Subject: [PATCH 07/63] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7457a53..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: anthy
-# $Id: Makefile,v 1.2 2007/10/15 18:35:48 notting Exp $
-NAME := anthy
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From 2ea5fecdb1d9fabb21d26cb4871f02132ee9e55e Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Mon, 27 Sep 2010 17:29:56 +0900
Subject: [PATCH 08/63] - spec file clean up (Parag AN, #552855)

---
 anthy.spec | 165 ++++++++++++++++++++++++++---------------------------
 1 file changed, 80 insertions(+), 85 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 2984192..ba114aa 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -1,88 +1,83 @@
-%define	use_utf8_dict	1
-%define	pkg		anthy
+%define use_utf8_dict 1
+%define pkg  anthy
 
-Name:		anthy
-Version:	9100h
-Release:	13%{?dist}
+Name:  anthy
+Version: 9100h
+Release: 14%{?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
+License: LGPLv2+ and GPLv2
+URL:  http://sourceforge.jp/projects/anthy/
+BuildRequires: emacs
 %if 0%{?rhel} == 0
-BuildRequires:	xemacs
+BuildRequires: xemacs
 %endif
 
-Source0:	http://osdn.dl.sourceforge.jp/anthy/37536/anthy-%{version}.tar.gz
-Source1:	anthy-init.el
-Patch0:		anthy-fix-typo-in-dict.patch
-Patch1:		anthy-fix-typo-in-dict-name.patch
-Patch10:	anthy-corpus.patch
+Source0: http://osdn.dl.sourceforge.jp/anthy/37536/anthy-%{version}.tar.gz
+Source1: anthy-init.el
+Patch0:  anthy-fix-typo-in-dict.patch
+Patch1:  anthy-fix-typo-in-dict-name.patch
+Patch10: anthy-corpus.patch
+
+Summary: Japanese character set input library
+Group:  System Environment/Libraries
 
-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
-Group:		Development/Libraries
-Requires:	anthy = %{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}
-BuildArch:	noarch
+%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}
+BuildArch: noarch
 
-%description -n	emacs-%{pkg}
+%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}
-BuildArch:	noarch
+%package -n emacs-%{pkg}-el
+Summary: Elisp source files for Anthy under GNU Emacs
+Group:  System Environment/Libraries
+Requires: emacs-%{pkg} = %{version}-%{release}
+BuildArch: noarch
 
-%description -n	emacs-%{pkg}-el
+%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.
 
 %if 0%{?rhel} == 0
-%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}
-BuildArch:	noarch
+%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}
+BuildArch: noarch
 
-%description -n	xemacs-%{pkg}
+%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}
-BuildArch:	noarch
+%package -n xemacs-%{pkg}-el
+Summary: Elisp source files for Anthy under XEmacs
+Group:  System Environment/Libraries
+Requires: xemacs-%{pkg} = %{version}-%{release}
+BuildArch: noarch
 
-%description -n	xemacs-%{pkg}-el
+%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.
@@ -95,18 +90,25 @@ package to use Anthy with XEmacs.
 %patch1 -p1 -b .1-typo-name
 %patch10 -p1 -b .10-corpus
 
-%if	%{use_utf8_dict}
+# 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}
 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
@@ -132,19 +134,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
@@ -155,16 +157,9 @@ gen_dict_args
 # fix rpath issue
 sed -ie 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' libtool
 LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags}
-#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params0
-#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params
-#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
-#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
-#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # remove unnecessary files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{la,a}
@@ -184,9 +179,6 @@ make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{_xemacs_si
 popd
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -231,6 +223,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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.
 

From f6cb65fb9a9d1cea2af3f5438531ef8bb9468fbd Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Thu, 7 Oct 2010 11:42:56 +0900
Subject: [PATCH 09/63] - Fix a typo in the dictionary. (#629908)

---
 anthy-fix-typo-in-dict.patch | 58 +++++++++++++++++++++++++++++++++++-
 anthy.spec                   |  5 +++-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/anthy-fix-typo-in-dict.patch b/anthy-fix-typo-in-dict.patch
index 0d6a4f3..78b729e 100644
--- a/anthy-fix-typo-in-dict.patch
+++ b/anthy-fix-typo-in-dict.patch
@@ -1,6 +1,6 @@
 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	2009-12-21 13:59:13.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診断
@@ -179,3 +179,59 @@ diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.
  ゆまくけいせいりょく #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 イスラム教
diff --git a/anthy.spec b/anthy.spec
index ba114aa..10d80eb 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 14%{?dist}
+Release: 15%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License: LGPLv2+ and GPLv2
 URL:  http://sourceforge.jp/projects/anthy/
@@ -223,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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)
 

From f5c7225cdb2329bac8c5c37e9fcad39e3815c99a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 7 Feb 2011 19:16:42 -0600
Subject: [PATCH 10/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 10d80eb..659fcdd 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 15%{?dist}
+Release: 16%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License: LGPLv2+ and GPLv2
 URL:  http://sourceforge.jp/projects/anthy/
@@ -223,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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)
 

From f9fe40f59abab41bafc9851edbf981e6d97ea0e3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 12 Jan 2012 15:18:35 -0600
Subject: [PATCH 11/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 659fcdd..e9c9ff7 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 16%{?dist}
+Release: 17%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License: LGPLv2+ and GPLv2
 URL:  http://sourceforge.jp/projects/anthy/
@@ -223,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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
 

From d726152e06baca436fd4da41e9a4b26741913b0e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 18 Jul 2012 11:04:33 -0500
Subject: [PATCH 12/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index e9c9ff7..438194d 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 17%{?dist}
+Release: 18%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License: LGPLv2+ and GPLv2
 URL:  http://sourceforge.jp/projects/anthy/
@@ -223,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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
 

From a96088f1d58f54e3d9b5ff1e84e697ce476f56bf Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Tue, 14 Aug 2012 15:59:48 +0900
Subject: [PATCH 13/63] Update License tag.

---
 anthy.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 438194d..5caa81b 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,9 +3,9 @@
 
 Name:  anthy
 Version: 9100h
-Release: 18%{?dist}
-# The entire source code is LGPLv2+ and dictionaries is GPLv2.
-License: LGPLv2+ and GPLv2
+Release: 19%{?dist}
+# The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
+License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
 BuildRequires: emacs
 %if 0%{?rhel} == 0
@@ -223,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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
 

From 9fbf270877e7221d3d122097f535152da7ecedba Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 13 Feb 2013 10:35:06 -0600
Subject: [PATCH 14/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 5caa81b..ce7c3a3 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 19%{?dist}
+Release: 20%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -223,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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.
 

From c2b0367b543123d7b3256c070c0344458413382d Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Fri, 8 Mar 2013 18:53:23 +0900
Subject: [PATCH 15/63] Apply a patch from Mike FABIAN to get anthy.el working
 back on Emacs 24.3.1.

---
 anthy-fix-elisp.patch | 12 ++++++++++++
 anthy.spec            |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 anthy-fix-elisp.patch

diff --git a/anthy-fix-elisp.patch b/anthy-fix-elisp.patch
new file mode 100644
index 0000000..a4da2a4
--- /dev/null
+++ b/anthy-fix-elisp.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	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))
+ 
+ ;;
+ ;;
diff --git a/anthy.spec b/anthy.spec
index ce7c3a3..3c69f7e 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 20%{?dist}
+Release: 21%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -17,6 +17,7 @@ Source1: anthy-init.el
 Patch0:  anthy-fix-typo-in-dict.patch
 Patch1:  anthy-fix-typo-in-dict-name.patch
 Patch10: anthy-corpus.patch
+Patch11: anthy-fix-elisp.patch
 
 Summary: Japanese character set input library
 Group:  System Environment/Libraries
@@ -89,6 +90,7 @@ package to use Anthy with XEmacs.
 %patch0 -p1 -b .0-typo
 %patch1 -p1 -b .1-typo-name
 %patch10 -p1 -b .10-corpus
+%patch11 -p1 -b .11-elisp
 
 # Convert to utf-8
 for file in ChangeLog doc/protocol.txt; do
@@ -223,6 +225,9 @@ popd
 %endif
 
 %changelog
+* 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
 

From a25ff2c5c6691a49594d91764bd7fd4a1671d02c Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Wed, 27 Mar 2013 19:42:29 +0900
Subject: [PATCH 16/63] Rebuilt for aarch64 support (#925002)

---
 anthy.spec | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 3c69f7e..b9f59ad 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 21%{?dist}
+Release: 22%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -18,6 +18,7 @@ Patch0:  anthy-fix-typo-in-dict.patch
 Patch1:  anthy-fix-typo-in-dict-name.patch
 Patch10: anthy-corpus.patch
 Patch11: anthy-fix-elisp.patch
+Patch12: %{name}-aarch64.patch
 
 Summary: Japanese character set input library
 Group:  System Environment/Libraries
@@ -31,7 +32,7 @@ So Anthy is secure than other conversion server.
 %package devel
 Summary: Header files and library for developing programs which uses Anthy
 Group:  Development/Libraries
-Requires: anthy = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
@@ -42,7 +43,7 @@ the programs which uses Anthy.
 Summary: Compiled elisp files to run Anthy under GNU Emacs
 Group:  System Environment/Libraries
 Requires: emacs(bin) >= %{_emacs_version}
-Requires: anthy = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildArch: noarch
 
 %description -n emacs-%{pkg}
@@ -65,7 +66,7 @@ package to use Anthy with GNU Emacs.
 Summary: Compiled elisp files to run Anthy under XEmacs
 Group:  System Environment/Libraries
 Requires: xemacs(bin) >= %{_xemacs_version}
-Requires: anthy = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildArch: noarch
 
 %description -n xemacs-%{pkg}
@@ -91,6 +92,7 @@ package to use Anthy with XEmacs.
 %patch1 -p1 -b .1-typo-name
 %patch10 -p1 -b .10-corpus
 %patch11 -p1 -b .11-elisp
+%patch12 -p1 -b .12-aarch64
 
 # Convert to utf-8
 for file in ChangeLog doc/protocol.txt; do
@@ -167,17 +169,17 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{la,a}
 
 ## for emacs-anthy
-%__mkdir_p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
 %if 0%{?rhel} == 0
 ## for xemacs-anthy
-%__mkdir_p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
+mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 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}"
+make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{_xemacs_sitelispdir}/%{pkg}" INSTALL="install -p"
 popd
 %endif
 
@@ -186,7 +188,6 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%defattr (-, root, root, -)
 %doc AUTHORS COPYING ChangeLog DIARY NEWS README
 %{_bindir}/*
 %{_sysconfdir}/*
@@ -194,37 +195,35 @@ popd
 %{_datadir}/anthy/
 
 %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_sitelispdir}/%{pkg}/*.elc
 %{_emacs_sitestartdir}/*.el
 %dir %{_emacs_sitelispdir}/%{pkg}
 
 %files -n emacs-%{pkg}-el
-%defattr(-, root, root, -)
 %{_emacs_sitelispdir}/%{pkg}/*.el
 
 %if 0%{?rhel} == 0
 %files -n xemacs-%{pkg}
-%defattr(-, root, root, -)
 %doc doc/ELISP
 %{_xemacs_sitelispdir}/%{pkg}/*.elc
 %{_xemacs_sitestartdir}/*.el
 %dir %{_xemacs_sitelispdir}/%{pkg}
 
 %files -n xemacs-%{pkg}-el
-%defattr(-, root, root, -)
 %{_xemacs_sitelispdir}/%{pkg}/*.el
 %endif
 
 %changelog
+* 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.
 

From 73046097ba7725cbe2cb0edeeb452f30f90de64a Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Wed, 27 Mar 2013 19:42:44 +0900
Subject: [PATCH 17/63] Rebuilt for aarch64 support (#925002)

---
 anthy-aarch64.patch | 1760 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1760 insertions(+)
 create mode 100644 anthy-aarch64.patch

diff --git a/anthy-aarch64.patch b/anthy-aarch64.patch
new file mode 100644
index 0000000..37faccd
--- /dev/null
+++ b/anthy-aarch64.patch
@@ -0,0 +1,1760 @@
+diff -urN anthy-9100h/config.guess anthy-9100h-aarch64/config.guess
+--- anthy-9100h/config.guess	2006-05-13 04:28:35.000000000 -0500
++++ anthy-9100h-aarch64/config.guess	2013-03-03 00:36:47.914391460 -0600
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
+ 
+-timestamp='2005-08-03'
++timestamp='2012-09-25'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -16,9 +17,7 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -26,16 +25,16 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ 
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -55,7 +54,8 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+@@ -106,7 +106,7 @@
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+@@ -143,7 +143,7 @@
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+@@ -160,6 +160,7 @@
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
++	    sh5el) machine=sh5le-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+@@ -168,7 +169,7 @@
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-			| grep __ELF__ >/dev/null
++			| grep -q __ELF__
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+@@ -178,7 +179,7 @@
+ 		fi
+ 		;;
+ 	    *)
+-	        os=netbsd
++		os=netbsd
+ 		;;
+ 	esac
+ 	# The OS release
+@@ -199,6 +200,10 @@
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit ;;
++    *:Bitrig:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	exit ;;
+     *:OpenBSD:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+@@ -206,8 +211,11 @@
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ 	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ 	exit ;;
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+@@ -218,7 +226,7 @@
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 		;;
+ 	*5.*)
+-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ 		;;
+ 	esac
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -264,7 +272,10 @@
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-	exit ;;
++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++	exitcode=$?
++	trap '' 0
++	exit $exitcode ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+@@ -290,12 +301,12 @@
+ 	echo s390-ibm-zvmoe
+ 	exit ;;
+     *:OS400:*:*)
+-        echo powerpc-ibm-os400
++	echo powerpc-ibm-os400
+ 	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit ;;
+-    arm:riscos:*:*|arm:RISCOS:*:*)
++    arm*:riscos:*:*|arm*:RISCOS:*:*)
+ 	echo arm-unknown-riscos
+ 	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+@@ -319,14 +330,33 @@
+ 	case `/usr/bin/uname -p` in
+ 	    sparc) echo sparc-icl-nx7; exit ;;
+ 	esac ;;
++    s390x:SunOS:*:*)
++	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+-    i86pc:SunOS:5.*:*)
+-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
++    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
++	eval $set_cc_for_build
++	SUN_ARCH="i386"
++	# If there is a compiler, see if it is configured for 64-bit objects.
++	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++	# This test works for both compilers.
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		grep IS_64BIT_ARCH >/dev/null
++	    then
++		SUN_ARCH="x86_64"
++	    fi
++	fi
++	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+@@ -370,23 +400,23 @@
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+-        exit ;;
++	exit ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+-        echo m68k-milan-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-milan-mint${UNAME_RELEASE}
++	exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-        echo m68k-hades-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-hades-mint${UNAME_RELEASE}
++	exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-        echo m68k-unknown-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-unknown-mint${UNAME_RELEASE}
++	exit ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+ 	exit ;;
+@@ -456,8 +486,8 @@
+ 	echo m88k-motorola-sysv3
+ 	exit ;;
+     AViiON:dgux:*:*)
+-        # DG/UX returns AViiON for all architectures
+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	# DG/UX returns AViiON for all architectures
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -470,7 +500,7 @@
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+- 	exit ;;
++	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+ 	exit ;;
+@@ -527,7 +557,7 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[45])
++    *:AIX:*:[4567])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -570,52 +600,52 @@
+ 	    9000/[678][0-9][0-9])
+ 		if [ -x /usr/bin/getconf ]; then
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+-                    case "${sc_cpu_version}" in
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+-                      532)                      # CPU_PA_RISC2_0
+-                        case "${sc_kernel_bits}" in
+-                          32) HP_ARCH="hppa2.0n" ;;
+-                          64) HP_ARCH="hppa2.0w" ;;
++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++		    case "${sc_cpu_version}" in
++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++		      532)                      # CPU_PA_RISC2_0
++			case "${sc_kernel_bits}" in
++			  32) HP_ARCH="hppa2.0n" ;;
++			  64) HP_ARCH="hppa2.0w" ;;
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
++			esac ;;
++		    esac
+ 		fi
+ 		if [ "${HP_ARCH}" = "" ]; then
+ 		    eval $set_cc_for_build
+-		    sed 's/^              //' << EOF >$dummy.c
++		    sed 's/^		//' << EOF >$dummy.c
++
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
+ 
+-              #define _HPUX_SOURCE
+-              #include <stdlib.h>
+-              #include <unistd.h>
+-
+-              int main ()
+-              {
+-              #if defined(_SC_KERNEL_BITS)
+-                  long bits = sysconf(_SC_KERNEL_BITS);
+-              #endif
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
+-
+-                  switch (cpu)
+-              	{
+-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+-              	case CPU_PA_RISC2_0:
+-              #if defined(_SC_KERNEL_BITS)
+-              	    switch (bits)
+-              		{
+-              		case 64: puts ("hppa2.0w"); break;
+-              		case 32: puts ("hppa2.0n"); break;
+-              		default: puts ("hppa2.0"); break;
+-              		} break;
+-              #else  /* !defined(_SC_KERNEL_BITS) */
+-              	    puts ("hppa2.0"); break;
+-              #endif
+-              	default: puts ("hppa1.0"); break;
+-              	}
+-                  exit (0);
+-              }
++		int main ()
++		{
++		#if defined(_SC_KERNEL_BITS)
++		    long bits = sysconf(_SC_KERNEL_BITS);
++		#endif
++		    long cpu  = sysconf (_SC_CPU_VERSION);
++
++		    switch (cpu)
++			{
++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++			case CPU_PA_RISC2_0:
++		#if defined(_SC_KERNEL_BITS)
++			    switch (bits)
++				{
++				case 64: puts ("hppa2.0w"); break;
++				case 32: puts ("hppa2.0n"); break;
++				default: puts ("hppa2.0"); break;
++				} break;
++		#else  /* !defined(_SC_KERNEL_BITS) */
++			    puts ("hppa2.0"); break;
++		#endif
++			default: puts ("hppa1.0"); break;
++			}
++		    exit (0);
++		}
+ EOF
+ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -635,7 +665,7 @@
+ 	    # => hppa64-hp-hpux11.23
+ 
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+-		grep __LP64__ >/dev/null
++		grep -q __LP64__
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+@@ -706,22 +736,22 @@
+ 	exit ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+-        exit ;;
++	exit ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-        exit ;;
++	exit ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+-        exit ;;
++	exit ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+-        exit ;;
++	exit ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+-        exit ;;
++	exit ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+@@ -745,14 +775,14 @@
+ 	exit ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-        exit ;;
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
+     5000:UNIX_System_V:4.*:*)
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ 	exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+@@ -764,27 +794,51 @@
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:FreeBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
++	case ${UNAME_PROCESSOR} in
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
+ 	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
+-    i*:MINGW*:*)
++    *:MINGW64*:*)
++	echo ${UNAME_MACHINE}-pc-mingw64
++	exit ;;
++    *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
++    i*:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit ;;
+     i*:windows32*:*)
+-    	# uname -m includes "-pc" on this system.
+-    	echo ${UNAME_MACHINE}-mingw32
++	# uname -m includes "-pc" on this system.
++	echo ${UNAME_MACHINE}-mingw32
+ 	exit ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    x86:Interix*:[34]*)
+-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+-	exit ;;
++    *:Interix*:*)
++	case ${UNAME_MACHINE} in
++	    x86)
++		echo i586-pc-interix${UNAME_RELEASE}
++		exit ;;
++	    authenticamd | genuineintel | EM64T)
++		echo x86_64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	    IA64)
++		echo ia64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
++    8664:Windows_NT:*)
++	echo x86_64-pc-mks
++	exit ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -814,17 +868,68 @@
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
++    aarch64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++	esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
+     arm*:Linux:*:*)
++	eval $set_cc_for_build
++	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++	    | grep -q __ARM_EABI__
++	then
++	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	else
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++		| grep -q __ARM_PCS_VFP
++	    then
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    else
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++	    fi
++	fi
++	exit ;;
++    avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo cris-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	exit ;;
+     frv:Linux:*:*)
+-    	echo frv-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    hexagon:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 	exit ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -835,66 +940,33 @@
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    mips:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips
+-	#undef mipsel
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+-	;;
+-    mips64:Linux:*:*)
++    mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+-	#undef mips64
+-	#undef mips64el
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     or32:Linux:*:*)
+-	echo or32-unknown-linux-gnu
+-	exit ;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++    padre:Linux:*:*)
++	echo sparc-unknown-linux-gnu
+ 	exit ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+@@ -904,14 +976,17 @@
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit ;;
+     sh64*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -919,68 +994,18 @@
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
++    tile*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    vax:Linux:*:*)
++	echo ${UNAME_MACHINE}-dec-linux-gnu
++	exit ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    xtensa*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
+-	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit ;;
+-	  coff-i386)
+-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+-		exit ;;
+-	  "")
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+-		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+-		exit ;;
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#ifdef __INTEL_COMPILER
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+-	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		exit
+-	}
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+-	;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+@@ -988,11 +1013,11 @@
+ 	echo i386-sequent-sysv4
+ 	exit ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+-        # Unixware is an offshoot of SVR4, but it has its own version
+-        # number series starting with 2...
+-        # I am not positive that other SVR4 systems won't match this,
++	# Unixware is an offshoot of SVR4, but it has its own version
++	# number series starting with 2...
++	# I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+-        # Use sysv4.2uw... so that sysv4* matches it.
++	# Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit ;;
+     i*86:OS/2:*:*)
+@@ -1009,7 +1034,7 @@
+     i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+ 	exit ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     i*86:*DOS:*:*)
+@@ -1024,7 +1049,7 @@
+ 	fi
+ 	exit ;;
+     i*86:*:5:[678]*)
+-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+@@ -1052,10 +1077,13 @@
+ 	exit ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+-        # the processor, so we play safe by assuming i386.
+-	echo i386-pc-msdosdjgpp
+-        exit ;;
++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
++	# the processor, so we play safe by assuming i586.
++	# Note: whatever this is, it MUST be the same as what config.sub
++	# prints for the "djgpp" host, or else GDB configury will decide that
++	# this is a cross-build.
++	echo i586-pc-msdosdjgpp
++	exit ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+ 	exit ;;
+@@ -1090,8 +1118,18 @@
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && { echo i486-ncr-sysv4; exit; } ;;
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4; exit; } ;;
++    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++	OS_REL='.3'
++	test -r /etc/.relid \
++	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+@@ -1104,7 +1142,7 @@
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+@@ -1124,10 +1162,10 @@
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit ;;
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+-        echo i586-unisys-sysv4
+-        exit ;;
++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++			# says <Richard.M.Bartel@ccMail.Census.GOV>
++	echo i586-unisys-sysv4
++	exit ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+@@ -1153,11 +1191,11 @@
+ 	exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+-	        echo mips-nec-sysv${UNAME_RELEASE}
++		echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+-	        echo mips-unknown-sysv${UNAME_RELEASE}
++		echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+-        exit ;;
++	exit ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+ 	exit ;;
+@@ -1167,6 +1205,12 @@
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit ;;
++    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
++	echo i586-pc-haiku
++	exit ;;
++    x86_64:Haiku:*:*)
++	echo x86_64-unknown-haiku
++	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+@@ -1176,6 +1220,15 @@
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+ 	exit ;;
++    SX-7:SUPER-UX:*:*)
++	echo sx7-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8:SUPER-UX:*:*)
++	echo sx8-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8R:SUPER-UX:*:*)
++	echo sx8r-nec-superux${UNAME_RELEASE}
++	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit ;;
+@@ -1185,7 +1238,16 @@
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
+-	    *86) UNAME_PROCESSOR=i686 ;;
++	    i386)
++		eval $set_cc_for_build
++		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1201,7 +1263,10 @@
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit ;;
+-    NSE-?:NONSTOP_KERNEL:*:*)
++    NEO-?:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    NSE-*:NONSTOP_KERNEL:*:*)
+ 	echo nse-tandem-nsk${UNAME_RELEASE}
+ 	exit ;;
+     NSR-?:NONSTOP_KERNEL:*:*)
+@@ -1246,13 +1311,13 @@
+ 	echo pdp10-unknown-its
+ 	exit ;;
+     SEI:*:*:SEIUX)
+-        echo mips-sei-seiux${UNAME_RELEASE}
++	echo mips-sei-seiux${UNAME_RELEASE}
+ 	exit ;;
+     *:DragonFly:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit ;;
+     *:*VMS:*:*)
+-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 	case "${UNAME_MACHINE}" in
+ 	    A*) echo alpha-dec-vms ; exit ;;
+ 	    I*) echo ia64-dec-vms ; exit ;;
+@@ -1264,11 +1329,17 @@
+     i*86:skyos:*:*)
+ 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ 	exit ;;
++    i*86:rdos:*:*)
++	echo ${UNAME_MACHINE}-pc-rdos
++	exit ;;
++    i*86:AROS:*:*)
++	echo ${UNAME_MACHINE}-pc-aros
++	exit ;;
++    x86_64:VMkernel:*:*)
++	echo ${UNAME_MACHINE}-unknown-esx
++	exit ;;
+ esac
+ 
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+@@ -1286,11 +1357,11 @@
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+-          "4"
++	"4"
+ #else
+-	  ""
++	""
+ #endif
+-         ); exit (0);
++	); exit (0);
+ #endif
+ #endif
+ 
+@@ -1424,9 +1495,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+ 
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ 
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+diff -urN anthy-9100h/config.sub anthy-9100h-aarch64/config.sub
+--- anthy-9100h/config.sub	2006-05-13 04:29:08.000000000 -0500
++++ anthy-9100h-aarch64/config.sub	2013-03-03 00:36:47.942388247 -0600
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
+ 
+-timestamp='2005-07-08'
++timestamp='2012-10-10'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -20,9 +21,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -31,13 +30,16 @@
+ 
+ 
+ # Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -71,7 +73,8 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+@@ -119,11 +122,18 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++  knetbsd*-gnu* | netbsd*-gnu* | \
++  kopensolaris*-gnu* | \
++  storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
++  android-linux)
++    os=-linux-android
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    ;;
+   *)
+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+     if [ $basic_machine != $1 ]
+@@ -146,10 +156,13 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple | -axis | -knuth | -cray)
++	-apple | -axis | -knuth | -cray | -microblaze*)
+ 		os=
+ 		basic_machine=$1
+ 		;;
++	-bluegene*)
++		os=-cnk
++		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+@@ -164,13 +177,17 @@
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+- 	-chorusrdb)
+- 		os=-chorusrdb
++	-chorusrdb)
++		os=-chorusrdb
+ 		basic_machine=$1
+- 		;;
++		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
++	-sco6)
++		os=-sco5v6
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-sco5)
+ 		os=-sco3.2v5
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -187,6 +204,10 @@
+ 		# Don't forget version if it is 3.2v4 or newer.
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-sco5v6*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-sco*)
+ 		os=-sco3.2v2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -204,6 +225,12 @@
+ 	-isc*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-lynx*178)
++		os=-lynxos178
++		;;
++	-lynx*5)
++		os=-lynxos5
++		;;
+ 	-lynx*)
+ 		os=-lynxos
+ 		;;
+@@ -228,23 +255,32 @@
+ 	# Some are omitted here because they have special meanings below.
+ 	1750a | 580 \
+ 	| a29k \
++	| aarch64 | aarch64_be \
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++        | be32 | be64 \
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+-	| fr30 | frv \
++	| epiphany \
++	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| hexagon \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
+-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++	| le32 | le64 \
++	| lm32 \
++	| m32c | m32r | m32rle | m68000 | m68k | m88k \
++	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+-	| mips64vr | mips64vrel \
++	| mips64octeon | mips64octeonel \
+ 	| mips64orion | mips64orionel \
++	| mips64r5900 | mips64r5900el \
++	| mips64vr | mips64vrel \
+ 	| mips64vr4100 | mips64vr4100el \
+ 	| mips64vr4300 | mips64vr4300el \
+ 	| mips64vr5000 | mips64vr5000el \
+@@ -257,35 +293,65 @@
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
+-	| ms1 \
++	| moxie \
++	| mt \
+ 	| msp430 \
++	| nds32 | nds32le | nds32be \
++	| nios | nios2 \
+ 	| ns16k | ns32k \
++	| open8 \
+ 	| or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| powerpc | powerpc64 | powerpc64le | powerpcle \
+ 	| pyramid \
+-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| rl78 | rx \
++	| score \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+-	| sparcv8 | sparcv9 | sparcv9b \
+-	| strongarm \
+-	| tahoe | thumb | tic4x | tic80 | tron \
+-	| v850 | v850e \
++	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++	| spu \
++	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
++	| ubicom32 \
++	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ 	| we32k \
+-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+-	| z8k)
++	| x86 | xc16x | xstormy16 | xtensa \
++	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m32c)
+-		basic_machine=$basic_machine-unknown
++	c54x)
++		basic_machine=tic54x-unknown
++		;;
++	c55x)
++		basic_machine=tic55x-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12)
+-		# Motorola 68HC11/12.
++	c6x)
++		basic_machine=tic6x-unknown
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+ 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ 		;;
++	ms1)
++		basic_machine=mt-unknown
++		;;
++
++	strongarm | thumb | xscale)
++		basic_machine=arm-unknown
++		;;
++	xgate)
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	xscaleeb)
++		basic_machine=armeb-unknown
++		;;
++
++	xscaleel)
++		basic_machine=armel-unknown
++		;;
+ 
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+@@ -301,29 +367,37 @@
+ 	# Recognize the basic CPU types with company name.
+ 	580-* \
+ 	| a29k-* \
++	| aarch64-* | aarch64_be-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+-	| avr-* \
++	| avr-* | avr32-* \
++	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
+-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+ 	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| hexagon-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
+-	| m32r-* | m32rle-* \
++	| le32-* | le64-* \
++	| lm32-* \
++	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+-	| m88110-* | m88k-* | maxq-* | mcore-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++	| microblaze-* | microblazeel-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+-	| mips64vr-* | mips64vrel-* \
++	| mips64octeon-* | mips64octeonel-* \
+ 	| mips64orion-* | mips64orionel-* \
++	| mips64r5900-* | mips64r5900el-* \
++	| mips64vr-* | mips64vrel-* \
+ 	| mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* \
+ 	| mips64vr5000-* | mips64vr5000el-* \
+@@ -336,30 +410,38 @@
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ 	| mipstx39-* | mipstx39el-* \
+ 	| mmix-* \
+-	| ms1-* \
++	| mt-* \
+ 	| msp430-* \
++	| nds32-* | nds32le-* | nds32be-* \
++	| nios-* | nios2-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
++	| open8-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ 	| pyramid-* \
+-	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| rl78-* | romp-* | rs6000-* | rx-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+-	| tahoe-* | thumb-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++	| tahoe-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile*-* \
+ 	| tron-* \
+-	| v850-* | v850e-* | vax-* \
++	| ubicom32-* \
++	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++	| vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+-	| xstormy16-* | xtensa-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* \
++	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+-	| z8k-*)
++	| z8k-* | z80-*)
+ 		;;
+-	m32c-*)
++	# Recognize the basic CPU types without company name, with glob match.
++	xtensa*)
++		basic_machine=$basic_machine-unknown
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -377,7 +459,7 @@
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+-    	abacus)
++	abacus)
+ 		basic_machine=abacus-unknown
+ 		;;
+ 	adobe68k)
+@@ -423,6 +505,10 @@
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
++	aros)
++		basic_machine=i386-pc
++		os=-aros
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -431,10 +517,35 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
++	blackfin)
++		basic_machine=bfin-unknown
++		os=-linux
++		;;
++	blackfin-*)
++		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
++	bluegene*)
++		basic_machine=powerpc-ibm
++		os=-cnk
++		;;
++	c54x-*)
++		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c55x-*)
++		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c6x-*)
++		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+ 		;;
++	cegcc)
++		basic_machine=arm-unknown
++		os=-cegcc
++		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+@@ -463,8 +574,8 @@
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16c)
+-		basic_machine=cr16c-unknown
++	cr16 | cr16-*)
++		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+ 	crds | unos)
+@@ -502,6 +613,10 @@
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
++	dicos)
++		basic_machine=i686-pc
++		os=-dicos
++		;;
+ 	djgpp)
+ 		basic_machine=i586-pc
+ 		os=-msdosdjgpp
+@@ -617,7 +732,6 @@
+ 	i370-ibm* | ibm*)
+ 		basic_machine=i370-ibm
+ 		;;
+-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+ 	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+@@ -656,6 +770,14 @@
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
++	m68knommu)
++		basic_machine=m68k-unknown
++		os=-linux
++		;;
++	m68knommu-*)
++		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+@@ -667,10 +789,21 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++	microblaze*)
++		basic_machine=microblaze-xilinx
++		;;
++	mingw64)
++		basic_machine=x86_64-pc
++		os=-mingw64
++		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
++	mingw32ce)
++		basic_machine=arm-unknown
++		os=-mingw32ce
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -696,10 +829,21 @@
+ 		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
++	ms1-*)
++		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		;;
++	msys)
++		basic_machine=i386-pc
++		os=-msys
++		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+ 		;;
++	nacl)
++		basic_machine=le32-unknown
++		os=-nacl
++		;;
+ 	ncr3000)
+ 		basic_machine=i486-ncr
+ 		os=-sysv4
+@@ -764,6 +908,12 @@
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
++	neo-tandem)
++		basic_machine=neo-tandem
++		;;
++	nse-tandem)
++		basic_machine=nse-tandem
++		;;
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
+@@ -794,6 +944,14 @@
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
++	parisc)
++		basic_machine=hppa-unknown
++		os=-linux
++		;;
++	parisc-*)
++		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+@@ -803,6 +961,12 @@
+ 	pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+ 		;;
+@@ -832,9 +996,10 @@
+ 		;;
+ 	power)	basic_machine=power-ibm
+ 		;;
+-	ppc)	basic_machine=powerpc-unknown
++	ppc | ppcbe)	basic_machine=powerpc-unknown
+ 		;;
+-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc-* | ppcbe-*)
++		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+@@ -859,6 +1024,10 @@
+ 		basic_machine=i586-unknown
+ 		os=-pw32
+ 		;;
++	rdos)
++		basic_machine=i386-pc
++		os=-rdos
++		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+@@ -885,6 +1054,10 @@
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
++	sde)
++		basic_machine=mipsisa32-sde
++		os=-elf
++		;;
+ 	sei)
+ 		basic_machine=mips-sei
+ 		os=-seiux
+@@ -896,6 +1069,9 @@
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
++	sh5el)
++		basic_machine=sh5le-unknown
++		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+@@ -917,6 +1093,9 @@
+ 		basic_machine=i860-stratus
+ 		os=-sysv4
+ 		;;
++	strongarm-* | thumb-*)
++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+@@ -973,17 +1152,9 @@
+ 		basic_machine=t90-cray
+ 		os=-unicos
+ 		;;
+-	tic54x | c54x*)
+-		basic_machine=tic54x-unknown
+-		os=-coff
+-		;;
+-	tic55x | c55x*)
+-		basic_machine=tic55x-unknown
+-		os=-coff
+-		;;
+-	tic6x | c6x*)
+-		basic_machine=tic6x-unknown
+-		os=-coff
++	tile*)
++		basic_machine=$basic_machine-unknown
++		os=-linux-gnu
+ 		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+@@ -1052,6 +1223,9 @@
+ 	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
++	xscale-* | xscalee[bl]-*)
++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+@@ -1060,6 +1234,10 @@
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
++	z80-*-coff)
++		basic_machine=z80-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1098,10 +1276,10 @@
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+-	sparc | sparcv8 | sparcv9 | sparcv9b)
++	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	cydra)
+@@ -1145,9 +1323,12 @@
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+-        # First match some system type aliases
+-        # that might get confused with valid system types.
++	# First match some system type aliases
++	# that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
++	-auroraux)
++		os=-auroraux
++		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+@@ -1168,27 +1349,31 @@
+ 	# Each alternative MUST END IN A *, to match a version number.
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++	      | -sym* | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+-	      | -aos* \
++	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+-	      | -chorusos* | -chorusrdb* \
+-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -chorusos* | -chorusrdb* | -cegcc* \
++	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1227,7 +1412,7 @@
+ 	-opened*)
+ 		os=-openedition
+ 		;;
+-        -os400*)
++	-os400*)
+ 		os=-os400
+ 		;;
+ 	-wince*)
+@@ -1276,7 +1461,7 @@
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
+-        -tpf*)
++	-tpf*)
+ 		os=-tpf
+ 		;;
+ 	-triton*)
+@@ -1318,6 +1503,11 @@
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
++	-dicos*)
++		os=-dicos
++		;;
++	-nacl*)
++		;;
+ 	-none)
+ 		;;
+ 	*)
+@@ -1340,6 +1530,12 @@
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
++	score-*)
++		os=-elf
++		;;
++	spu-*)
++		os=-elf
++		;;
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
+@@ -1349,9 +1545,21 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-    c4x-* | tic4x-*)
+-        os=-coff
+-        ;;
++	c4x-* | tic4x-*)
++		os=-coff
++		;;
++	hexagon-*)
++		os=-elf
++		;;
++	tic54x-*)
++		os=-coff
++		;;
++	tic55x-*)
++		os=-coff
++		;;
++	tic6x-*)
++		os=-coff
++		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+ 		os=-tops20
+@@ -1370,13 +1578,13 @@
+ 		;;
+ 	m68000-sun)
+ 		os=-sunos3
+-		# This also exists in the configure program, but was not the
+-		# default.
+-		# os=-sunos4
+ 		;;
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
++	mep-*)
++		os=-elf
++		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
+@@ -1401,7 +1609,7 @@
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+-    	*-knuth)
++	*-knuth)
+ 		os=-mmixware
+ 		;;
+ 	*-wec)
+@@ -1506,7 +1714,7 @@
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+-			-aix*)
++			-cnk*|-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)

From f6527972ed4e8284e759f275724778d767a62812 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Mon, 15 Apr 2013 17:56:19 +0900
Subject: [PATCH 18/63] minor

---
 anthy.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index b9f59ad..8467988 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -43,7 +43,7 @@ the programs which uses Anthy.
 Summary: Compiled elisp files to run Anthy under GNU Emacs
 Group:  System Environment/Libraries
 Requires: emacs(bin) >= %{_emacs_version}
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 
 %description -n emacs-%{pkg}
@@ -66,7 +66,7 @@ package to use Anthy with GNU Emacs.
 Summary: Compiled elisp files to run Anthy under XEmacs
 Group:  System Environment/Libraries
 Requires: xemacs(bin) >= %{_xemacs_version}
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 
 %description -n xemacs-%{pkg}

From 9b3d81882f711d4d7fa87fc9e6c35c808398ec54 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Mon, 17 Jun 2013 19:33:09 +0900
Subject: [PATCH 19/63] Fix a segfault issue. (#973127)

---
 anthy-fix-segfault.patch | 14 ++++++++++++++
 anthy.spec               | 17 +++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 anthy-fix-segfault.patch

diff --git a/anthy-fix-segfault.patch b/anthy-fix-segfault.patch
new file mode 100644
index 0000000..aff744e
--- /dev/null
+++ b/anthy-fix-segfault.patch
@@ -0,0 +1,14 @@
+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{
diff --git a/anthy.spec b/anthy.spec
index 8467988..d3f63d1 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 22%{?dist}
+Release: 23%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -13,12 +13,13 @@ BuildRequires: xemacs
 %endif
 
 Source0: http://osdn.dl.sourceforge.jp/anthy/37536/anthy-%{version}.tar.gz
-Source1: anthy-init.el
-Patch0:  anthy-fix-typo-in-dict.patch
-Patch1:  anthy-fix-typo-in-dict-name.patch
-Patch10: anthy-corpus.patch
-Patch11: anthy-fix-elisp.patch
+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
 
 Summary: Japanese character set input library
 Group:  System Environment/Libraries
@@ -93,6 +94,7 @@ package to use Anthy with XEmacs.
 %patch10 -p1 -b .10-corpus
 %patch11 -p1 -b .11-elisp
 %patch12 -p1 -b .12-aarch64
+%patch13 -p1 -b .13-segv
 
 # Convert to utf-8
 for file in ChangeLog doc/protocol.txt; do
@@ -221,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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)
 

From bff1dcf1dff20bd94c0c6829bcc2a89dd4a62753 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 2 Aug 2013 19:52:42 -0500
Subject: [PATCH 20/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index d3f63d1..64ca073 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 23%{?dist}
+Release: 24%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -223,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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)
 

From 2b4451ac0a555efd196b274eb1f5264ec0fe552e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 6 Jun 2014 19:46:29 -0500
Subject: [PATCH 21/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 64ca073..f211dfe 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 24%{?dist}
+Release: 25%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -223,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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
 

From 4d4732990ad797409936dd21933c0de09d14d984 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Fri, 15 Aug 2014 20:36:34 +0000
Subject: [PATCH 22/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index f211dfe..454e876 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 25%{?dist}
+Release: 26%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -223,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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
 

From b0ecb8d9b5ee43d69100e96ad5ba939f7dcf8f19 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 16 Jun 2015 23:57:39 +0000
Subject: [PATCH 23/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 454e876..6e06e0c 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 26%{?dist}
+Release: 27%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -223,6 +223,9 @@ popd
 %endif
 
 %changelog
+* 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
 

From 827012df634262122e6cd527f6916d20f334b611 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Tue, 23 Jun 2015 18:43:16 +0900
Subject: [PATCH 24/63] Merge -el sub-package into main (#1234577)

---
 anthy.spec | 40 ++++++++++------------------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 6e06e0c..8bc5e88 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 27%{?dist}
+Release: 28%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -45,47 +45,28 @@ Summary: Compiled elisp files to run Anthy under GNU Emacs
 Group:  System Environment/Libraries
 Requires: emacs(bin) >= %{_emacs_version}
 Requires: %{name} = %{version}-%{release}
+Provides: emacs-%{pkg}-el <= 9100h-27
+Obsoletes: emacs-%{pkg}-el <= 9100h-27
 BuildArch: noarch
 
 %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}
-BuildArch: noarch
-
-%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.
-
 %if 0%{?rhel} == 0
 %package -n xemacs-%{pkg}
 Summary: Compiled elisp files to run Anthy under XEmacs
 Group:  System Environment/Libraries
 Requires: xemacs(bin) >= %{_xemacs_version}
 Requires: %{name} = %{version}-%{release}
+Provides: xemacs-%{pkg}-el <= 9100h-27
+Obsoletes: xemacs-%{pkg}-el <= 9100h-27
 BuildArch: noarch
 
 %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}
-BuildArch: noarch
-
-%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.
-%endif
-
 
 %prep
 %setup -q #-a 2
@@ -204,25 +185,24 @@ popd
 
 %files -n emacs-%{pkg}
 %doc doc/ELISP
+%{_emacs_sitelispdir}/%{pkg}/*.el
 %{_emacs_sitelispdir}/%{pkg}/*.elc
 %{_emacs_sitestartdir}/*.el
 %dir %{_emacs_sitelispdir}/%{pkg}
 
-%files -n emacs-%{pkg}-el
-%{_emacs_sitelispdir}/%{pkg}/*.el
-
 %if 0%{?rhel} == 0
 %files -n xemacs-%{pkg}
 %doc doc/ELISP
+%{_xemacs_sitelispdir}/%{pkg}/*.el
 %{_xemacs_sitelispdir}/%{pkg}/*.elc
 %{_xemacs_sitestartdir}/*.el
 %dir %{_xemacs_sitelispdir}/%{pkg}
 
-%files -n xemacs-%{pkg}-el
-%{_xemacs_sitelispdir}/%{pkg}/*.el
-%endif
 
 %changelog
+* Tue Jun 23 2015 Akira TAGOH <tagoh@redhat.com> - 9100h-28
+- Merge -el sub-package 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
 

From 676595881c112906c90fb37ad709e416ad5b60f7 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Tue, 23 Jun 2015 18:55:45 +0900
Subject: [PATCH 25/63] Merge -el sub-package into main (#1234577)

---
 anthy.spec | 63 +++++++++++++++++-------------------------------------
 1 file changed, 20 insertions(+), 43 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 8bc5e88..5fc91f2 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -23,6 +23,14 @@ Patch13: %{name}-fix-segfault.patch
 
 Summary: Japanese character set input library
 Group:  System Environment/Libraries
+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 0%{?rhel} == 0
+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
 
 %description
 Anthy provides the library to input Japanese on the applications, such as
@@ -40,33 +48,6 @@ Requires: pkgconfig
 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: %{name} = %{version}-%{release}
-Provides: emacs-%{pkg}-el <= 9100h-27
-Obsoletes: emacs-%{pkg}-el <= 9100h-27
-BuildArch: noarch
-
-%description -n emacs-%{pkg}
-This package contains the byte compiled elisp packages to run Anthy with GNU
-Emacs.
-
-%if 0%{?rhel} == 0
-%package -n xemacs-%{pkg}
-Summary: Compiled elisp files to run Anthy under XEmacs
-Group:  System Environment/Libraries
-Requires: xemacs(bin) >= %{_xemacs_version}
-Requires: %{name} = %{version}-%{release}
-Provides: xemacs-%{pkg}-el <= 9100h-27
-Obsoletes: xemacs-%{pkg}-el <= 9100h-27
-BuildArch: noarch
-
-%description -n xemacs-%{pkg}
-This package contains the byte compiled elisp packages to use Anthy with
-XEmacs.
-
 
 %prep
 %setup -q #-a 2
@@ -176,6 +157,17 @@ popd
 %{_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 0%{?rhel} == 0
+%{_xemacs_sitelispdir}/%{pkg}/*.el
+%{_xemacs_sitelispdir}/%{pkg}/*.elc
+%{_xemacs_sitestartdir}/*.el
+%dir %{_xemacs_sitelispdir}/%{pkg}
+%endif
 
 %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
@@ -183,25 +175,10 @@ popd
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 
-%files -n emacs-%{pkg}
-%doc doc/ELISP
-%{_emacs_sitelispdir}/%{pkg}/*.el
-%{_emacs_sitelispdir}/%{pkg}/*.elc
-%{_emacs_sitestartdir}/*.el
-%dir %{_emacs_sitelispdir}/%{pkg}
-
-%if 0%{?rhel} == 0
-%files -n xemacs-%{pkg}
-%doc doc/ELISP
-%{_xemacs_sitelispdir}/%{pkg}/*.el
-%{_xemacs_sitelispdir}/%{pkg}/*.elc
-%{_xemacs_sitestartdir}/*.el
-%dir %{_xemacs_sitelispdir}/%{pkg}
-
 
 %changelog
 * Tue Jun 23 2015 Akira TAGOH <tagoh@redhat.com> - 9100h-28
-- Merge -el sub-package into main (#1234577)
+- 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

From 2d800fbd82e610fe75b99c23f3d5faf5f12c913e Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Mon, 4 Jan 2016 11:51:49 +0900
Subject: [PATCH 26/63] Use %global instead of %define.

---
 anthy.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 5fc91f2..ed8f957 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -1,5 +1,5 @@
-%define use_utf8_dict 1
-%define pkg  anthy
+%global use_utf8_dict 1
+%global pkg  anthy
 
 Name:  anthy
 Version: 9100h
@@ -177,6 +177,9 @@ popd
 
 
 %changelog
+* 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)
 

From 815acfe239bf42b5ee2e7df4f704ec5ae701e798 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 3 Feb 2016 16:13:42 +0000
Subject: [PATCH 27/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index ed8f957..6308b8c 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 28%{?dist}
+Release: 29%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -177,6 +177,9 @@ popd
 
 
 %changelog
+* 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.
 

From 4b30bdf5da7ec195c74aeccf4ec327e5afea4347 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 06:00:39 +0000
Subject: [PATCH 28/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 6308b8c..a518ba9 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 29%{?dist}
+Release: 30%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -177,6 +177,9 @@ popd
 
 
 %changelog
+* 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
 

From eca49881e2f253fb82316777698d1dcc4cb8a991 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 02:54:58 +0000
Subject: [PATCH 29/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index a518ba9..427b922 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 30%{?dist}
+Release: 31%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -177,6 +177,9 @@ popd
 
 
 %changelog
+* 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
 

From 75802dd0e8a4f757c79db77135468690d2b915e9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 2 Aug 2017 17:35:59 +0000
Subject: [PATCH 30/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 427b922..1eacf99 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 31%{?dist}
+Release: 32%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -177,6 +177,9 @@ popd
 
 
 %changelog
+* 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
 

From 9733f77c45a71d4e2426bae12b762d6c43245d30 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 02:21:05 +0000
Subject: [PATCH 31/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 1eacf99..386095e 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 32%{?dist}
+Release: 33%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -177,6 +177,9 @@ popd
 
 
 %changelog
+* 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
 

From 32493c20861cf4d7f77fd1bc85e34392fe307bca Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 19 Feb 2018 16:23:27 +0900
Subject: [PATCH 32/63] Add BR: gcc.

---
 anthy.spec | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 386095e..e915a41 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,11 +3,12 @@
 
 Name:  anthy
 Version: 9100h
-Release: 33%{?dist}
+Release: 34%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
 BuildRequires: emacs
+BuildRequires: gcc
 %if 0%{?rhel} == 0
 BuildRequires: xemacs
 %endif
@@ -50,13 +51,7 @@ the programs which uses Anthy.
 
 
 %prep
-%setup -q #-a 2
-%patch0 -p1 -b .0-typo
-%patch1 -p1 -b .1-typo-name
-%patch10 -p1 -b .10-corpus
-%patch11 -p1 -b .11-elisp
-%patch12 -p1 -b .12-aarch64
-%patch13 -p1 -b .13-segv
+%autosetup -p1
 
 # Convert to utf-8
 for file in ChangeLog doc/protocol.txt; do
@@ -152,7 +147,8 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING ChangeLog DIARY NEWS README
+%doc AUTHORS ChangeLog DIARY NEWS README
+%license COPYING
 %{_bindir}/*
 %{_sysconfdir}/*
 %{_libdir}/lib*.so.*
@@ -177,6 +173,9 @@ popd
 
 
 %changelog
+* 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
 

From 388841539ddfee07dcac4d56983a2526c2327a37 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Fri, 29 Jun 2018 10:13:45 +0000
Subject: [PATCH 33/63] Use ldconfig rpm macro.

---
 anthy.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index e915a41..59290a4 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 34%{?dist}
+Release: 35%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -142,9 +142,7 @@ make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{_xemacs_si
 popd
 %endif
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
 %doc AUTHORS ChangeLog DIARY NEWS README
@@ -173,6 +171,9 @@ popd
 
 
 %changelog
+* 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.
 

From 240a9badecd6c8e3f2de695f166467fd161fb4ec Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 12 Jul 2018 20:15:46 +0000
Subject: [PATCH 34/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 59290a4..7557a18 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 35%{?dist}
+Release: 36%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -171,6 +171,9 @@ popd
 
 
 %changelog
+* 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.
 

From e8c0832f986bb0f1a816949d135c5cf30fe437b5 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:38 +0100
Subject: [PATCH 35/63] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 anthy.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 7557a18..40a57a0 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -23,7 +23,6 @@ Patch12: %{name}-aarch64.patch
 Patch13: %{name}-fix-segfault.patch
 
 Summary: Japanese character set input library
-Group:  System Environment/Libraries
 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
@@ -41,7 +40,6 @@ So Anthy is secure than other conversion server.
 
 %package devel
 Summary: Header files and library for developing programs which uses Anthy
-Group:  Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 

From 4f9499820df3d2430e63cf728c7e1ab2c9f3c8ea Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 13:22:21 +0000
Subject: [PATCH 36/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 40a57a0..35062cd 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 36%{?dist}
+Release: 37%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -169,6 +169,9 @@ popd
 
 
 %changelog
+* 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
 

From a15ddd3c75ee740028bae14cd2697fc3013da329 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 22 May 2019 04:43:05 +0000
Subject: [PATCH 37/63] Add CI tests for trial

---
 tests/tests.yml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 tests/tests.yml

diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..8032518
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,9 @@
+- hosts: localhost
+  tags:
+  - classic
+  required_package:
+  - anthy
+  roles:
+  - role: standard-test-basic
+  tests:
+  - run: true

From b9a2c6cf2eaba37c5071978b8b06a69e38b4dad3 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 22 May 2019 05:52:52 +0000
Subject: [PATCH 38/63] Update CI

---
 tests/runtest.sh |  4 ++++
 tests/tests.yml  | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100755 tests/runtest.sh

diff --git a/tests/runtest.sh b/tests/runtest.sh
new file mode 100755
index 0000000..26aba13
--- /dev/null
+++ b/tests/runtest.sh
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+echo "RESULT: PASS"
+
diff --git a/tests/tests.yml b/tests/tests.yml
index 8032518..b7184da 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -1,9 +1,9 @@
 - hosts: localhost
-  tags:
-  - classic
-  required_package:
-  - anthy
   roles:
   - role: standard-test-basic
-  tests:
-  - run: true
+    tags:
+    - classic
+    required_packages:
+    - anthy
+    tests:
+    - run: ./runtest.sh

From a1736d6d621fb67fdfc4ccc31508eb8efc39b396 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 17:58:04 +0000
Subject: [PATCH 39/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 35062cd..65ef2a7 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 37%{?dist}
+Release: 38%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -169,6 +169,9 @@ popd
 
 
 %changelog
+* 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
 

From 47723c2fa4b9d3dd4658fb92256e0b79dcf777e8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 11:38:41 +0000
Subject: [PATCH 40/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 65ef2a7..c5620d8 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 38%{?dist}
+Release: 39%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -169,6 +169,9 @@ popd
 
 
 %changelog
+* 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
 

From be41928258bb9eb612c515b1cbf2db18e1589f1a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 12:06:17 +0000
Subject: [PATCH 41/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index c5620d8..422ed06 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 39%{?dist}
+Release: 40%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -169,6 +169,9 @@ popd
 
 
 %changelog
+* 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
 

From 379e61b79801e324b9ddd0ba5ee2e060f30f7473 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jul 2020 23:59:41 +0000
Subject: [PATCH 42/63] - Second attempt - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 422ed06..325d016 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 40%{?dist}
+Release: 41%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -169,6 +169,10 @@ popd
 
 
 %changelog
+* 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
 

From 76f42db021ba365588bfc3abb0035917aa55f4cc Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 16 Dec 2020 23:29:58 +0000
Subject: [PATCH 43/63] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 anthy.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anthy.spec b/anthy.spec
index 325d016..ba73d88 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -11,6 +11,7 @@ BuildRequires: emacs
 BuildRequires: gcc
 %if 0%{?rhel} == 0
 BuildRequires: xemacs
+BuildRequires: make
 %endif
 
 Source0: http://osdn.dl.sourceforge.jp/anthy/37536/anthy-%{version}.tar.gz

From e991d395161eec622eefc707893d3064866a20a3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 00:10:04 +0000
Subject: [PATCH 44/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index ba73d88..7b2a8b5 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 41%{?dist}
+Release: 42%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -170,6 +170,9 @@ popd
 
 
 %changelog
+* 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

From 80ed39970af11d0daa89587eac762d87d284adff Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 12:42:55 +0000
Subject: [PATCH 45/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 26da1446d7ab4938f9b211417afcb9dcd7c6dd46 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 17:38:46 +0000
Subject: [PATCH 46/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 7b2a8b5..ca221b6 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 42%{?dist}
+Release: 43%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -170,6 +170,9 @@ popd
 
 
 %changelog
+* 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
 

From 382ee417bf3ad2635fc2ce0676a216ca7a1177ad Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Tue, 9 Nov 2021 16:12:07 -0700
Subject: [PATCH 47/63] Drop XEmacs support in F36 and later

---
 anthy.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index ca221b6..ae3769e 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,13 +3,13 @@
 
 Name:  anthy
 Version: 9100h
-Release: 43%{?dist}
+Release: 44%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
 BuildRequires: emacs
 BuildRequires: gcc
-%if 0%{?rhel} == 0
+%if 0%{?rhel} == 0 && 0%{?fedora} < 36
 BuildRequires: xemacs
 BuildRequires: make
 %endif
@@ -27,7 +27,7 @@ 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 0%{?rhel} == 0
+%if 0%{?rhel} == 0 && 0%{?fedora} < 36
 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
@@ -130,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{la,a}
 mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
-%if 0%{?rhel} == 0
+%if 0%{?rhel} == 0 && 0%{?fedora} < 36
 ## for xemacs-anthy
 mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
@@ -155,7 +155,7 @@ popd
 %{_emacs_sitelispdir}/%{pkg}/*.elc
 %{_emacs_sitestartdir}/*.el
 %dir %{_emacs_sitelispdir}/%{pkg}
-%if 0%{?rhel} == 0
+%if 0%{?rhel} == 0 && 0%{?fedora} < 36
 %{_xemacs_sitelispdir}/%{pkg}/*.el
 %{_xemacs_sitelispdir}/%{pkg}/*.elc
 %{_xemacs_sitestartdir}/*.el
@@ -170,6 +170,9 @@ popd
 
 
 %changelog
+* 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
 

From 93bf0b2d0c90572d6fbdc2231de0358e9134fd47 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 21:20:44 +0000
Subject: [PATCH 48/63] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index ae3769e..8c938a6 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -3,7 +3,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 44%{?dist}
+Release: 45%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -170,6 +170,9 @@ popd
 
 
 %changelog
+* 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
 

From b6498063182f0fe452da37c800abac2e6bb6faae Mon Sep 17 00:00:00 2001
From: Stewart Smith <trawets@amazon.com>
Date: Sat, 14 May 2022 18:52:06 +0000
Subject: [PATCH 49/63] Make building with xemacs a bcond

Signed-off-by: Stewart Smith <trawets@amazon.com>
---
 anthy.spec | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 8c938a6..5add52b 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -1,15 +1,22 @@
 %global use_utf8_dict 1
 %global pkg  anthy
 
+%if 0%{?rhel} == 0 && 0%{?fedora} < 36
+%bcond_without xemacs
+%else
+# xemacs disabled on RHEL and Fedora 36+
+%bcond_with xemacs
+%endif
+
 Name:  anthy
 Version: 9100h
-Release: 45%{?dist}
+Release: 46%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
 BuildRequires: emacs
 BuildRequires: gcc
-%if 0%{?rhel} == 0 && 0%{?fedora} < 36
+%if %{with xemacs}
 BuildRequires: xemacs
 BuildRequires: make
 %endif
@@ -27,7 +34,7 @@ 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 0%{?rhel} == 0 && 0%{?fedora} < 36
+%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
@@ -130,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{la,a}
 mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
-%if 0%{?rhel} == 0 && 0%{?fedora} < 36
+%if %{with xemacs}
 ## for xemacs-anthy
 mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
@@ -155,7 +162,7 @@ popd
 %{_emacs_sitelispdir}/%{pkg}/*.elc
 %{_emacs_sitestartdir}/*.el
 %dir %{_emacs_sitelispdir}/%{pkg}
-%if 0%{?rhel} == 0 && 0%{?fedora} < 36
+%if %{with xemacs}
 %{_xemacs_sitelispdir}/%{pkg}/*.el
 %{_xemacs_sitelispdir}/%{pkg}/*.elc
 %{_xemacs_sitestartdir}/*.el
@@ -170,6 +177,9 @@ popd
 
 
 %changelog
+* Tue May 31 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
 

From 9a502de2727d9ce88a9ebc973582743b7f6d3bb3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 20:54:39 +0000
Subject: [PATCH 50/63] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index 5add52b..04c1e76 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -10,7 +10,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 46%{?dist}
+Release: 47%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  http://sourceforge.jp/projects/anthy/
@@ -177,6 +177,9 @@ popd
 
 
 %changelog
+* 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 Stewart Smith <trawets@amazon.com> - 9100h-46
 - Switch xemacs build condition to bcond
 

From fa8f57dda1e1863b01dcb309ca958f07f39d0274 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Tue, 29 Nov 2022 20:32:40 +0900
Subject: [PATCH 51/63] Convert License tag to SPDX.

---
 anthy.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index 04c1e76..abb8811 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -10,9 +10,9 @@
 
 Name:  anthy
 Version: 9100h
-Release: 47%{?dist}
+Release: 48%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
-License: LGPLv2+ and GPLv2 and 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
@@ -177,6 +177,9 @@ popd
 
 
 %changelog
+* Tue Nov 29 2022 Akira TAGOH <tagoh@redhat.com> - 9100h-48
+- 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
 

From d4f15b435418985dceda6cb63b253fa2bdb9e567 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 30 Nov 2022 18:44:09 +0900
Subject: [PATCH 52/63] Correct SPDX license tag again

---
 anthy.spec | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/anthy.spec b/anthy.spec
index abb8811..b05468a 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -10,9 +10,9 @@
 
 Name:  anthy
 Version: 9100h
-Release: 48%{?dist}
+Release: 49%{?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
+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
@@ -177,13 +177,13 @@ popd
 
 
 %changelog
-* Tue Nov 29 2022 Akira TAGOH <tagoh@redhat.com> - 9100h-48
+* 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 Stewart Smith <trawets@amazon.com> - 9100h-46
+* 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
@@ -545,4 +545,3 @@ popd
 
 * Tue Jun 01 2004 Akira TAGOH <tagoh@redhat.com> 5330-1
 - Initial package.
-

From 4c55c70f84019e8a9c3c2cad091c60a036e0d795 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 21:49:55 +0000
Subject: [PATCH 53/63] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 anthy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anthy.spec b/anthy.spec
index b05468a..5c1cde6 100644
--- a/anthy.spec
+++ b/anthy.spec
@@ -10,7 +10,7 @@
 
 Name:  anthy
 Version: 9100h
-Release: 49%{?dist}
+Release: 50%{?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 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.
 

From 726911c0de22d7a6bc1b5767f3a110fa74949d60 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 13:23:36 +0000
Subject: [PATCH 54/63] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <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
 

From 861cb04cf9c2f67960c7e6660b0b7fbcd95ec907 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Tue, 28 Nov 2023 16:35:40 +0900
Subject: [PATCH 55/63] 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 <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
 

From db5a572a2100825f6e2a32e44aa07e17c31ce93d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 13:05:11 +0000
Subject: [PATCH 56/63] 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 <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

From 89c726ba9942ba197ef70e4feeec9d10b93d485d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 23:09:32 +0000
Subject: [PATCH 57/63] 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 <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
 

From 038875320b901263da6de4a5d98899173aaf3d7e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 17:06:46 +0000
Subject: [PATCH 58/63] 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 <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
 

From b02b7add018d57a71da3ce2b45b4a34253145801 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 19 Sep 2024 16:53:23 +0900
Subject: [PATCH 59/63] 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 <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
 

From 9f2261715c0748141887fccc66d5e4ba15d283ed Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 11:10:52 +0000
Subject: [PATCH 60/63] 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 <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

From b818691011b489fa27c3a8bc622243512b57818b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 17:03:25 +0000
Subject: [PATCH 61/63] 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 <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
 

From 80d1caa5bc6c98914b9aadfe61795c2cff3034fd Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 18 Aug 2025 19:35:28 +0900
Subject: [PATCH 62/63] 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 <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:44:38 +0000
Subject: [PATCH 63/63] 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 <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