diff --git a/.cvsignore b/.gitignore similarity index 85% rename from .cvsignore rename to .gitignore index dc2bfd5..8e3fa33 100644 --- a/.cvsignore +++ b/.gitignore @@ -28,3 +28,7 @@ anthy-8607.tar.gz anthy-8616.tar.gz anthy-8622.tar.gz anthy-8706.tar.gz +anthy-9100.tar.gz +anthy-9100b.tar.gz +alt-cannadic-070805.tar.bz2 +anthy-9100d.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 072e2da..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: anthy -# $Id$ -NAME := anthy -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/anthy-enable-dict-gtankan.patch b/anthy-enable-dict-gtankan.patch new file mode 100644 index 0000000..c756de6 --- /dev/null +++ b/anthy-enable-dict-gtankan.patch @@ -0,0 +1,15 @@ +diff -ruN anthy-9100b.orig/mkworddic/dict.args.in anthy-9100b/mkworddic/dict.args.in +--- anthy-9100b.orig/mkworddic/dict.args.in 2007-09-16 21:38:40.000000000 +0900 ++++ anthy-9100b/mkworddic/dict.args.in 2007-09-18 19:53:52.000000000 +0900 +@@ -10,9 +10,9 @@ + read @top_srcdir@/alt-cannadic/gcanna.ctd + # + read @top_srcdir@/alt-cannadic/gcannaf.ctd +-#read @top_srcdir@/alt-cannadic/gtankan.ctd ++read @top_srcdir@/alt-cannadic/gtankan.ctd + # +-read @top_srcdir@/mkworddic/gtankan.ctd ++#read @top_srcdir@/mkworddic/gtankan.ctd + read @top_srcdir@/mkworddic/adjust.t + read @top_srcdir@/mkworddic/name.t + read @top_srcdir@/mkworddic/compound.t diff --git a/anthy.spec b/anthy.spec index 31806c1..252943b 100644 --- a/anthy.spec +++ b/anthy.spec @@ -1,20 +1,19 @@ -%define gcanna_ver 20051002 -%{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}} +%define altcannadicver 070805 Name: anthy -Version: 8706 -Release: 2%{?dist} -License: GPL +Version: 9100d +Release: 1%{?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: automake autoconf -%ifnarch ppc64 BuildRequires: emacs -%endif -%{?_with_xemacs:BuildRequires: xemacs} +BuildRequires: xemacs -Source0: http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz +Source0: http://prdownloads.sourceforge.jp/anthy/27771/anthy-%{version}.tar.gz Source1: anthy-init.el +#Source2: http://prdownloads.sourceforge.jp/alt-cannadic/26595/alt-cannadic-%{altcannadicver}.tar.bz2 Summary: Japanese character set input library Group: System Environment/Libraries @@ -34,7 +33,6 @@ Requires: anthy = %{version}-%{release} The anthy-devel package contains the development files which is needed to build the programs which uses Anthy. -%ifnarch ppc64 %package el Summary: Emacs Lisp files to use Anthy on Emacs Group: System Environment/Libraries @@ -43,9 +41,7 @@ Requires: anthy = %{version}-%{release} %description el The anthy-el package contains the emacs lisp to be able to input Japanese character set on Emacs. -%endif -%if %{build_with_xemacs} %package el-xemacs Summary: Emacs Lisp files to use Anthy on XEmacs Group: System Environment/Libraries @@ -54,10 +50,10 @@ Requires: anthy = %{version}-%{release} %description el-xemacs The anthy-el-xemacs package contains the emacs lisp to be able to input Japanese character set on XEmacs. -%endif %prep -%setup -q +%setup -q #-a 2 +#cp alt-cannadic-%{altcannadicver}/* alt-cannadic/ %build %configure --disable-static @@ -71,14 +67,11 @@ make install DESTDIR=$RPM_BUILD_ROOT # remove unnecessary files rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la -%ifnarch ppc64 ## for anthy-el %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d -%endif ## for anthy-el-xemacs -%if %{build_with_xemacs} %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util @@ -86,7 +79,6 @@ make clean make EMACS=xemacs lispdir="\${datadir}/xemacs/xemacs-packages/lisp/anthy" make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="\${datadir}/xemacs/xemacs-packages/lisp/anthy" popd -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -110,23 +102,44 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.so %{_libdir}/pkgconfig -%ifnarch ppc64 %files el %defattr (-, root, root) %doc doc/ELISP %{_datadir}/emacs/site-lisp/anthy/ %{_datadir}/emacs/site-lisp/site-start.d/anthy-init.el -%endif -%if %{build_with_xemacs} %files el-xemacs %defattr (-, root, root) %doc doc/ELISP %{_datadir}/xemacs/xemacs-packages/lisp/anthy/ %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el -%endif %changelog +* Mon Oct 29 2007 Akira TAGOH - 9100d-1 +- New upstream release. +- anthy-enable-dict-gtankan.patch: removed. no need to be applied anymore. + +* Tue Sep 18 2007 Akira TAGOH - 9100b-1 +- New upstream release. + +* Thu Aug 23 2007 Akira TAGOH - 9100-3 +- Rebuild + +* Wed Aug 8 2007 Akira TAGOH - 9100-2 +- Update alt-cannadic to 070805. +- Use gtankan.ctd instead of tankanji.t. +- Update License tag. + +* Tue Jul 3 2007 Akira TAGOH - 9100-1 +- New upstream release. + +* Wed Jun 13 2007 Akira TAGOH - 9011-1 +- New upstream release + +* Fri Jun 8 2007 Akira TAGOH - 9006-1 +- New upstream release. +- Get back the anthy-el-xemacs package. (#243078) + * Fri Apr 27 2007 Akira TAGOH - 8706-2 - Fix wrong Provides line. (#237987) diff --git a/sources b/sources index 0bc358d..7a0dbb2 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -8fffbbc9f8642ecde771133e092d623c anthy-8706.tar.gz +0ad3873646255a2ca1c8576350fabb27 anthy-9100b.tar.gz +17f849584baa5ae025542035b429f1b4 alt-cannadic-070805.tar.bz2 +4f629d34034de402c3fb647713bdb0ad anthy-9100d.tar.gz