rpms/anthy/devel anthy.spec,1.50,1.51
Akira TAGOH
tagoh at fedoraproject.org
Wed Feb 4 09:53:32 UTC 2009
Author: tagoh
Update of /cvs/pkgs/rpms/anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv703
Modified Files:
anthy.spec
Log Message:
* Wed Feb 4 2009 Akira TAGOH <tagoh at redhat.com> - 9100g-1
- New upstream release.
- convert all words in dictionaries to UTF-8.
- Rename anthy-el and anthy-el-xemacs to emacs-anthy{,-el} and xemacs-anthy{,-el}.
- Fix RPATH issue.
- Support words for JIS X 0213:2004 in dictionary. (#195437)
Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- anthy.spec 21 Nov 2008 07:22:30 -0000 1.50
+++ anthy.spec 4 Feb 2009 09:53:02 -0000 1.51
@@ -1,17 +1,38 @@
+%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: 9100e
-Release: 4%{?dist}
+Version: 9100g
+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
-BuildRequires: emacs
+BuildRequires: emacs emacs-el
BuildRequires: xemacs
-Source0: http://osdn.dl.sourceforge.jp/anthy/29142/anthy-%{version}.tar.gz
+Source0: http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
Source1: anthy-init.el
-Patch0: anthy-9100e-fix-segfault-vu.patch
Summary: Japanese character set input library
Group: System Environment/Libraries
@@ -31,31 +52,118 @@
The anthy-devel package contains the development files which is needed to build
the programs which uses Anthy.
-%package el
-Summary: Emacs Lisp files to use Anthy on Emacs
+%package -n emacs-%{pkg}
+Summary: Compiled elisp files to run Anthy under GNU Emacs
Group: System Environment/Libraries
-Requires: emacs
+Requires: emacs(bin) >= %{emacs_version}
Requires: anthy = %{version}-%{release}
-%description el
-The anthy-el package contains the emacs lisp to be able to input Japanese
-character set on Emacs.
+Obsoletes: anthy-el < 9100g-1
+Provides: anthy-el = %{version}-%{release}
+
+%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}
+
+%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.
-%package el-xemacs
-Summary: Emacs Lisp files to use Anthy on XEmacs
+%package -n xemacs-%{pkg}
+Summary: Compiled elisp files to run Anthy under XEmacs
Group: System Environment/Libraries
-Requires: xemacs
+Requires: xemacs(bin) >= %{xemacs_version}
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.
+Obsoletes: anthy-el-xemacs < 9100g-1
+Provides: anthy-el-xemacs = %{version}-%{release}
+
+%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}
+
+%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.
+
%prep
%setup -q #-a 2
-%patch0 -p1 -b 0-vu
#cp alt-cannadic-%{altcannadicver}/* alt-cannadic/
+%if %{use_utf8_dict}
+function normalize_extra_dict() {
+ 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
+}
+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
+# Generated by rpm script
+set_input_encoding utf8
+read @top_srcdir@/alt-cannadic/gcanna.ctd.utf8
+read @top_srcdir@/alt-cannadic/gcannaf.ctd.utf8
+read @top_srcdir@/alt-cannadic/gtankan.ctd.utf8
+read @top_srcdir@/alt-cannadic/extra/g-jiritu-34.t.norm
+read @top_srcdir@/alt-cannadic/extra/gc-fullname-34.t.norm
+read @top_srcdir@/alt-cannadic/extra/gt-tankanji_kanji-34.t.norm
+read @top_srcdir@/alt-cannadic/extra/gt-tankanji_hikanji-34.t.norm
+read @top_srcdir@/alt-cannadic/extra/gf-fuzoku-34.t.norm
+read @top_srcdir@/mkworddic/adjust.t.utf8
+read @top_srcdir@/mkworddic/compound.t.utf8
+read @top_srcdir@/mkworddic/extra.t.utf8
+read @top_srcdir@/mkworddic/utf8.t
+read @top_srcdir@/alt-cannadic/g_fname.t
+#
+build_reverse_dict
+set_dict_encoding utf8
+read_uc @top_srcdir@/mkworddic/udict
+write anthy.wdic
+done
+_EOF_
+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 mkworddic
+ # getting rid of broken word in name.t
+ cp -a name.t name.t-broken
+ grep -v $(echo "ã¨ããããã¸ã" | iconv -f utf-8 -t euc-jp) name.t-broken > name.t
+ for i in adjust.t base.t compound.t extra.t name.t tankanji.t udict zipcode.t; do
+ dict_conv $i
+ done
+)
+gen_dict_args
+%endif
+
+
%build
%configure --disable-static
+# fix rpath issue
+sed -ie 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' libtool
make %{?_smp_mflags}
%install
@@ -64,19 +172,19 @@
make install DESTDIR=$RPM_BUILD_ROOT
# remove unnecessary files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{la,a}
-## 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
-
-## for anthy-el-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
+## for emacs-anthy
+%__mkdir_p $RPM_BUILD_ROOT%{emacs_startdir}
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}
+
+## for xemacs-anthy
+%__mkdir_p $RPM_BUILD_ROOT%{xemacs_startdir}
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{xemacs_startdir}
pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util
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"
+make EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
+make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
popd
%clean
@@ -87,7 +195,7 @@
%postun -p /sbin/ldconfig
%files
-%defattr (-, root, root)
+%defattr (-, root, root, -)
%doc AUTHORS COPYING ChangeLog DIARY NEWS README
%{_bindir}/*
%{_sysconfdir}/*
@@ -95,25 +203,43 @@
%{_datadir}/anthy/
%files devel
-%defattr (-, root, root)
+%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
-%files el
-%defattr (-, root, root)
+%files -n emacs-%{pkg}
+%defattr(-, root, root, -)
%doc doc/ELISP
-%{_datadir}/emacs/site-lisp/anthy/
-%{_datadir}/emacs/site-lisp/site-start.d/anthy-init.el
+%{emacs_lispdir}/%{pkg}/*.elc
+%{emacs_startdir}/*.el
+%dir %{emacs_lispdir}/%{pkg}
+
+%files -n emacs-%{pkg}-el
+%defattr(-, root, root, -)
+%{emacs_lispdir}/%{pkg}/*.el
-%files el-xemacs
-%defattr (-, root, root)
+%files -n xemacs-%{pkg}
+%defattr(-, root, root, -)
%doc doc/ELISP
-%{_datadir}/xemacs/xemacs-packages/lisp/anthy/
-%{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
+%{xemacs_lispdir}/%{pkg}/*.elc
+%{xemacs_startdir}/*.el
+%dir %{xemacs_lispdir}/%{pkg}
+
+%files -n xemacs-%{pkg}-el
+%defattr(-, root, root, -)
+%{xemacs_lispdir}/%{pkg}/*.el
+
%changelog
+* Wed Feb 4 2009 Akira TAGOH <tagoh at redhat.com> - 9100g-1
+- New upstream release.
+- convert all words in dictionaries to UTF-8.
+- Rename anthy-el and anthy-el-xemacs to emacs-anthy{,-el} and xemacs-anthy{,-el}.
+- Fix RPATH issue.
+- Support words for JIS X 0213:2004 in dictionary. (#195437)
+
* Fri Nov 21 2008 Akira TAGOH <tagoh at redhat.com> - 9100e-4
- Fix a source URL.
More information about the fedora-extras-commits
mailing list