rpms/anthy/F-12 anthy-fix-typo-in-dict-name.patch, NONE, 1.1 anthy.spec, 1.63, 1.64

Mon May 10 11:21:50 UTC 2010

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19888

Modified Files:
	anthy.spec 
Added Files:
	anthy-fix-typo-in-dict-name.patch 
Log Message:
* Mon May 10 2010 Akira TAGOH <tagoh at redhat.com> - 9100h-12
- Fix a typo in g_fname.t. (#584614)

anthy-fix-typo-in-dict-name.patch:
 alt-cannadic/g_fname.t |    2 +-
 mkworddic/name.t       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE anthy-fix-typo-in-dict-name.patch ---
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ÁíÍý


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-12/anthy.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- anthy.spec	21 Dec 2009 05:09:55 -0000	1.63
+++ anthy.spec	10 May 2010 11:21:49 -0000	1.64
@@ -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 <tagoh at redhat.com> - 9100h-12
+- Fix a typo in g_fname.t. (#584614)
+
+* Mon Mar 15 2010 Akira TAGOH <tagoh at redhat.com> - 9100h-11
+- enable UTF-8 dictionaries really.
+
+* Sun Mar 14 2010 Jonathan G. Underwood <jonathan.underwood at gmail.com>
+- Update spec file to comply with Emacs add-on packaging guidelines (#573449)
+
 * Mon Dec 21 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-10
 - Fix more typos in dictionary. (#548078)
 - correct the source URL.

