From 62abb5942c25689b09a6fe75a363a7bbbd2495ad Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 08:09:54 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for anthy --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 2da79db254a2b98f6c0663c8f090dd9e59fd1e5e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:27:53 +0000 Subject: [PATCH 2/5] 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 96ee9a3b249638835f675dd9a892f4b5a69bc445 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 21 Dec 2009 05:09:55 +0000 Subject: [PATCH 3/5] - 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 - 9100h-10 +- Fix more typos in dictionary. (#548078) +- correct the source URL. + * Thu Sep 3 2009 Dennis Gregorovic - 9100h-9 - Do not build against xemacs on RHEL From 17a3c9133b9a2ffc67caf89e9acad40052a980b1 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 10 May 2010 11:21:49 +0000 Subject: [PATCH 4/5] - Fix a typo in g_fname.t. (#584614) --- anthy-fix-typo-in-dict-name.patch | 24 ++++++++++ anthy.spec | 75 ++++++++++++++----------------- 2 files changed, 57 insertions(+), 42 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 b0eabe8..a55a4f1 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: 12%{?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 @@ -36,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 @@ -60,7 +41,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 +64,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} @@ -107,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() { @@ -120,7 +102,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 @@ -138,7 +120,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_ @@ -184,17 +166,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 +205,37 @@ 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 +* Mon May 10 2010 Akira TAGOH - 9100h-12 +- Fix a typo in g_fname.t. (#584614) + +* Mon Mar 15 2010 Akira TAGOH - 9100h-11 +- enable UTF-8 dictionaries really. + +* Sun Mar 14 2010 Jonathan G. Underwood +- Update spec file to comply with Emacs add-on packaging guidelines (#573449) + * Mon Dec 21 2009 Akira TAGOH - 9100h-10 - Fix more typos in dictionary. (#548078) - correct the source URL. From c06c9903e67b3189d8f800586da794e008b790a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:02:07 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12