update to 2.00, rebuild with skkdic-20160410

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10141 ec354946-7b23-47d6-9f5a-488ba84defc7

d/dbskkd-cdb/dbskkd-cdb-vl.spec

@@ -1,31 +1,35 @@
-%define	cdb_ver	0.62
+%define pkg_name dbskkd-cdb
+%define pkg_version 2.00
+%define pkg_release 6%{?_dist_release}
 
-Summary: A dictionary server for the SKK Japanese input method system
+%define cdb_ver 0.78
+
+Summary:     A dictionary server for the SKK Japanese input method system
 Summary(ja): SKK 日本語入力メソッドの辞書サーバ
-Name: dbskkd-cdb
-Version: 1.01
-Release: 21%{?_dist_release}
-License: BSD
-Group: Applications/Services
-Source0: http://www.ne.jp/asahi/bdx/info/software/%{name}-%{version}.tar.gz
-Source1: dbskkd-cdb.xinetd
-# from freecdb.spec
-#Source2: ftp://koobera.math.uic.edu/www/software/%{name}-%{version}.tar.gz
-#URL2: ftp://koobera.math.uic.edu/www/cdb.html
-Source2: ftp://ftp.debian.org/debian/dists/woody/main/source/utils/freecdb_%{cdb_ver}.tar.gz
-Patch1: dbskkd-cdb-1.01.makefile.patch
-Patch2: dbskkd-cdb-freecdb.makefile.patch
-Patch3: dbskkd-cdb-1.01.strip.patch
-URL: http://www.ne.jp/asahi/bdx/info/software/jp-dbskkd.html
-BuildRequires: skkdic >= 20020220-1
+Name:        %{pkg_name}
+Version:     %{pkg_version}
+Release:     %{pkg_release}
+
+License: GPL
+Group:   Applications/System
+URL:     http://www.ne.jp/asahi/bdx/info/software/jp-dbskkd.html
+
+Source0: https://github.com/jj1bdx/dbskkd-cdb/archive/%{name}-%{version}_IMPORTED_FROM_SVN.tar.gz
+Source1: http://www.corpit.ru/mjt/tinycdb/tinycdb-%{cdb_ver}.tar.gz
+Source2: dbskkd-cdb.xinetd
+Patch1:  dbskkd-cdb-2.00.c.patch
+Patch2:  dbskkd-cdb-2.00.makefile.patch
+
+BuildRequires: skkdic
+Requires:      xinetd
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Provides: skkserv
-Obsoletes: skkserv
-Conflicts: skkdic <= 20010617-2
-Conflicts: rskkserv
 
 Vendor:       Project Vine
 Distribution: Vine Linux
+Packager: ara_t
+
 
 %description
 dbskkd-cdb is a dictionary server for the SKK Japanese input method
@@ -36,51 +40,75 @@ D. J. Bernstein (DJB) for faster dictionary access.
 #Add an entry for dbskkd-cdb to /etc/hosts.allow when using with tcp_wrappers.
 #ex. dbskkd-cdb: 127.0.0.1
 
+%description -l ja
+dbskkd-cdbは、skkservと同様の機能を提供する
+SKK用の共通辞書サーバーである。
+辞書は D. J. Bernsteinのcdbを使ってデータベース化し、
+検索を高速化している。
+本サーバーは同種のツールpskkservを基にしている。
+
+
 %prep
-%setup -q -a 2
+%setup -q -n %{name}-%{version}_IMPORTED_FROM_SVN -q -a 1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .strip
 
-rm -fr $RPM_BUILD_ROOT
+%{__rm} -rf ${RPM_BUILD_ROOT}
 
 %build
-make -C freecdb-%{cdb_ver}
+%{__make} -C tinycdb-%{cdb_ver}
 
 for JISYO in %{_datadir}/skk/SKK-JISYO.*
 do
   LJISYO=`basename $JISYO`
-  ./skktocdbm.sh < $JISYO | freecdb-%{cdb_ver}/cdbmake $LJISYO.cdb $LJISYO.tmp
+  ./skktocdbm.sh < ${JISYO} > ${LJISYO}.cdb
 done
 
-make LDFLAGS="-Lfreecdb-%{cdb_ver} -lfreecdb"
+%{__make} CDBLIB="-Ltinycdb-%{cdb_ver} -lcdb"
 
 %install
-rm -fr $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/sbin
-mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d/
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/skk
+%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_sbindir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}/etc/xinetd.d/
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/skk
 
-make DESTDIR=$RPM_BUILD_ROOT install
-install -m0644 %SOURCE1 $RPM_BUILD_ROOT/etc/xinetd.d/dbskkd-cdb
-
-install -m0644 SKK-JISYO.*.cdb $RPM_BUILD_ROOT%{_datadir}/skk
+%{__install} -m0755 dbskkd-cdb ${RPM_BUILD_ROOT}%{_prefix}/sbin
+%{__install} -m0644 %{SOURCE2} ${RPM_BUILD_ROOT}/etc/xinetd.d/dbskkd-cdb
+%{__install} -m0644 SKK-JISYO.*.cdb ${RPM_BUILD_ROOT}%{_datadir}/skk
 
 %clean
-rm -fr $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-, root, root)
 %config(noreplace) /etc/xinetd.d/dbskkd-cdb
-%doc LICENSE Release-Notes.English Release-Notes.Japanese
-%{_sbindir}/*
+%doc CHANGES LICENSE README READMEJP
+%{_sbindir}/
 %{_datadir}/skk
 %config
 
+
 %changelog
-* Sun Dec 14 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.01-21
-- rebuilt on current VineSeed
-- moved to Applications/Services Group
+* Sun Apr 10 2016 Toshiaki Ara <ara_t@384.jp> 2.00-6
+- rebuild with skkdic-2016410
+- add Packager tag
+
+* Sat Mar 12 2016 Toshiaki Ara <ara_t@384.jp> 2.00-5
+- rebuild with skkdic-20160306
+
+* Mon Dec 28 2015 Toshiaki Ara <ara_t@384.jp> 2.00-4
+- rebuild with skkdic-20151227
+
+* Tue Nov 17 2015 Toshiaki Ara <ara_t@384.jp> 2.00-3
+- rebuild with skkdic-20151115
+- add Requires: xinetd
+
+* Thu Sep 24 2015 Toshiaki Ara <ara_t@384.jp> 2.00-2
+- rebuild with skkdic-20150920
+
+* Thu Jul 09 2015 Toshiaki Ara <ara_t@384.jp> 2.00-1
+- update 2.00
 
 * Sat Jun 16 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.01-20
 - rebuild with Vine6 environment