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 089fda7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: anthy -# $Id: Makefile,v 1.1 2005/07/29 05:34:35 tagoh 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 -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/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-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..a55a4f1 100644 --- a/anthy.spec +++ b/anthy.spec @@ -1,42 +1,23 @@ %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: 9%{?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 -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 +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,41 @@ 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. + * Thu Sep 3 2009 Dennis Gregorovic - 9100h-9 - Do not build against xemacs on RHEL