dist-git conversion

#2781)

.gitignore

@@ -36,3 +36,4 @@ anthy-9100b.tar.gz
 alt-cannadic-070918.tar.bz2
 anthy-9100d.tar.gz
 anthy-9100e.tar.gz
+anthy-9100h.tar.gz

Makefile

@@ -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)

anthy.spec

@@ -1,15 +1,37 @@
+%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
+Version:	9100h
-Release:	2%{?dist}
+Release:	4%{?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 emacs-el
-BuildRequires:	emacs
 BuildRequires:	xemacs
 
-Source0:	http://prdownloads.sourceforge.jp/anthy/29142/anthy-%{version}.tar.gz
+Source0:	http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 
 Summary:	Japanese character set input library
@@ -26,35 +48,120 @@ So Anthy is secure than other conversion server.
 Summary:	Header files and library for developing programs which uses Anthy
 Group:		Development/Libraries
 Requires:	anthy = %{version}-%{release}
+Requires:	pkgconfig
 %description	devel
 The anthy-devel package contains the development files which is needed to build
 the programs which uses Anthy.
 
-%package	el
+%package -n	emacs-%{pkg}
-Summary:	Emacs Lisp files to use Anthy on Emacs
+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
+Obsoletes:	anthy-el < 9100g-1
-The anthy-el package contains the emacs lisp to be able to input Japanese
+Provides:	anthy-el = %{version}-%{release}
-character set on Emacs.
 
-%package	el-xemacs
+%description -n	emacs-%{pkg}
-Summary:	Emacs Lisp files to use Anthy on XEmacs
+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:	xemacs
+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 -n	xemacs-%{pkg}
+Summary:	Compiled elisp files to run Anthy under XEmacs
+Group:		System Environment/Libraries
+Requires:	xemacs(bin) >= %{xemacs_version}
 Requires:	anthy = %{version}-%{release}
-%description	el-xemacs
+Obsoletes:	anthy-el-xemacs < 9100g-1
-The anthy-el-xemacs package contains the emacs lisp to be able to input Japanese
+Provides:	anthy-el-xemacs = %{version}-%{release}
-character set on XEmacs.
+
+%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
-#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
+	for i in adjust.t compound.t extra.t udict zipcode.t; do
+		dict_conv $i
+	done
+)
+gen_dict_args
+%endif
+
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+# fix rpath issue
+sed -ie 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' libtool
+LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,19 +169,19 @@ rm -rf $RPM_BUILD_ROOT
 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
+## for emacs-anthy
-%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+%__mkdir_p $RPM_BUILD_ROOT%{emacs_startdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}
 
-## for anthy-el-xemacs
+## for xemacs-anthy
-%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d
+%__mkdir_p $RPM_BUILD_ROOT%{xemacs_startdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d
+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 EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
-make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="\${datadir}/xemacs/xemacs-packages/lisp/anthy"
+make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
 popd
 
 %clean
@@ -85,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %doc AUTHORS COPYING ChangeLog DIARY NEWS README
 %{_bindir}/*
 %{_sysconfdir}/*
@@ -93,25 +200,62 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
+%{_libdir}/pkgconfig/*.pc
 
-%files el
+%files -n emacs-%{pkg}
-%defattr (-, root, root)
+%defattr(-, root, root, -)
 %doc doc/ELISP
-%{_datadir}/emacs/site-lisp/anthy/
+%{emacs_lispdir}/%{pkg}/*.elc
-%{_datadir}/emacs/site-lisp/site-start.d/anthy-init.el
+%{emacs_startdir}/*.el
+%dir %{emacs_lispdir}/%{pkg}
 
-%files el-xemacs
+%files -n emacs-%{pkg}-el
-%defattr (-, root, root)
+%defattr(-, root, root, -)
+%{emacs_lispdir}/%{pkg}/*.el
+
+%files -n xemacs-%{pkg}
+%defattr(-, root, root, -)
 %doc doc/ELISP
-%{_datadir}/xemacs/xemacs-packages/lisp/anthy/
+%{xemacs_lispdir}/%{pkg}/*.elc
-%{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
+%{xemacs_startdir}/*.el
+%dir %{xemacs_lispdir}/%{pkg}
+
+%files -n xemacs-%{pkg}-el
+%defattr(-, root, root, -)
+%{xemacs_lispdir}/%{pkg}/*.el
+
 
 %changelog
+* Mon May 11 2009 Akira TAGOH <tagoh@redhat.com> - 9100h-4
+- Take off the ownership of %%{_libdir}/pkgconfig. (#499663)
+- Add R: pkgconfig to -devel.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9100h-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 10 2009 Akira TAGOH <tagoh@redhat.com> - 9100h-1
+- New upstream release.
+
+* Fri Feb  6 2009 Akira TAGOH <tagoh@redhat.com> - 9100g-2
+- Apply a patch reported upstream to fix dictionary's indexing.
+
+* Wed Feb  4 2009 Akira TAGOH <tagoh@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@redhat.com> - 9100e-4
+- Fix a source URL.
+
+* Fri Jun 27 2008 Akira TAGOH <tagoh@redhat.com> - 9100e-3
+- Fix a segfault with some words containing vu. (#452779)
+
 * Tue Feb 12 2008 Akira TAGOH <tagoh@redhat.com> - 9100e-2
 - Rebuild for gcc-4.3.
 

sources

@@ -1 +1 @@
-1c328986005e61f503adc118909e12ac  anthy-9100e.tar.gz
+1f558ff7ed296787b55bb1c6cf131108  anthy-9100h.tar.gz