2015-01-29 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* eb: fixed files encoding
	* gerbv, irrlicht: updated
	* kaffeine: added patch
	* mana, manadic: rebuilt
	* ndtpd: fixed spec
	


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

e/eb/eb-vl.spec

@@ -2,22 +2,23 @@ Summary: C Library for accessing CD-ROM books
 Summary(ja): CD-ROM 書籍にアクセスするための C ライブラリ
 Name: eb
 Version: 4.4.3
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: Modified BSD-style license
 Group: System Environment/Libraries
 URL: http://www.sra.co.jp/people/m-kasahr/eb/
+
 Source0: ftp://ftp.sra.co.jp/pub/misc/eb/%{name}-%{version}.tar.bz2
-#Patch0: ftp://ftp.sra.co.jp/pub/misc/eb/%{name}-%{version}+.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel >= 1.1.3
+BuildRequires: nkf
 Requires: zlib >= 1.1.3
+# for old stuff
 Requires(preun): /sbin/install-info
 Conflicts: ndtpd = 2.3.7
 
 Distribution: Vine Linux
 Vendor: Project Vine
-
 Packager: inagaki
 
 %description
@@ -29,32 +30,34 @@ EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats.
 %description -l ja
 EB ライブラリは CD-ROM 書籍にアクセスするための C のライブラリです。
 UNIX 系 OS のシステム上で動作させることができます。
-EB, EBG, EBXA, EBXA-C, S-EBXA および EPWING 形式の
+EB, EBG, EBXA, EBXA-C, S-EBXA および EPWING 形式の CD-ROM 書籍に対応しています。
-CD-ROM 書籍に対応しています。
 
 %package devel
 Summary: Header files to develop apps which will use eb.
 Summary(ja): eb を使うアプリケーションを開発するためのヘッダーファイル
 Group: Development/Libraries
-Requires: eb = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The eb-devel package contains the header files
 which enable you to develop programs utilizing the eb library.
 
 %description devel -l ja
-eb-devel パッケージには、eb ライブラリを利用するプログラムを開発
+eb-devel パッケージには、eb ライブラリを利用するプログラムを開発するために必要なヘッダーファイルが含まれています。
-するために必要なヘッダーファイルが含まれています。
 
 %prep
 %setup -q
 
+mv README README.old
+nkf -w README.old > README
+
 %build
 env CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" \
-%configure --with-zlib-include=%{_includedir} \
+%configure --with-zlib-includes=%{_includedir} \
            --with-zlib-libraries=%{_libdir} \
            --disable-static
-make
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,7 +87,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog* INSTALL* NEWS README*
+%doc AUTHORS COPYING ChangeLog* NEWS README*
 %config %{_sysconfdir}/eb.conf
 %{_bindir}/*
 %{_libdir}/libeb.so.*
@@ -96,12 +99,15 @@ fi
 %defattr(-,root,root)
 %dir %{_includedir}/eb
 %{_includedir}/eb/*
-#{_libdir}/libeb.a
-#{_libdir}/libeb.la
 %{_libdir}/libeb.so
 %{_datadir}/aclocal/eb4.m4
 
 %changelog
+* Wed Jan 28 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.4.3-3
+- rebuilt on current VineSeed
+- fixed README encoding
+- fixed typo at %%configure
+
 * Thu Jan 24 2013 IWAI, Masaharu <iwai@alib.jp> 4.4.3-2
 - build with current VineSeed
 

g/gerbv/gerbv-vl.spec

@@ -1,11 +1,12 @@
 Name:             gerbv
-Version:          2.4.0
+Version:          2.6.0
-Release:          2%{?dist}
+Release:          1%{?dist}
 Summary:          Gerber file viewer from the gEDA toolkit
+Summary(ja):      gEDA ツールキット由来のガーバーファイルビューア
 
 Group:            Applications/Engineering
 License:          GPLv2
-URL:              http://gerbv.gpleda.org/index.html
+URL:              http://gerbv.geda-project.org/
 
 Source:           http://downloads.sourceforge.net/gerbv/%{name}-%{version}.tar.gz
 
@@ -31,32 +32,36 @@ and different EDA-vendors implement it different.
 gerbv is listed among Fedora Electronic Lab (FEL) packages.
 
 %package devel
-Summary:          Header files, libraries and development documentation for %{name}
+Summary:          Header files and development libraries for %{name}
+Summary(ja):      %{name} のヘッダファイル及び開発用ライブラリ
 Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
 Requires:         gtk2-devel
 Requires:         libpng-devel
 
 %description devel
-This package contains the header files, libraries and development
+This package contains the header files and development libraries
-documentation for %{name}. If you like to develop programs using %{name},
+for %{name}. If you like to develop programs using %{name}, you
-you will need to install %{name}-devel.
+will need to install %{name}-devel.
 
 
 %prep
 %setup -q
 
 %build
-
 # default measurement units set to millimeters
-%configure             \
+%configure \
-   --enable-exportpng  \
+    --disable-static  \
-   --enable-unit-mm    \
+    --enable-unit-mm  \
-   --disable-update-desktop-database \
+    --disable-update-desktop-database \
-   --disable-static    \
+    CFLAGS="${RPM_OPT_FLAGS}" \
-   --enable-gtk2
+    LIBS="-ldl -lpthread"
-
+
-# clean unused-direct-shlib-dependencies
+# Don't use rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+# Clean unused-direct-shlib-dependencies
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 make %{?_smp_mflags}
@@ -135,6 +140,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Thu Jan 29 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.6.0-1
+- updated to 2.6.0
+- built on current VineSeed
+
 * Tue Sep 28 2010 Shu KONNO <owa@bg.wakwak.com> 2.4.0-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

i/irrlicht/irrlicht-vl.spec

@@ -1,28 +1,37 @@
-%global irrxml_version 1.2
+%global irrxml_version 1.8.1
+%global irrlicht_version 1.8.1
 
 Name:		irrlicht
 Summary: 	A high performance realtime 3D engine
-Version:	1.7.2
+Summary(ja): 	高性能なリアルタイム3Dエンジン
+Version:	%{irrlicht_version}
 Release:	1%{?_dist_release}
+
 License:	zlib
 Group:		System Environment/Libraries
-Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
+URL:		http://irrlicht.sourceforge.net/
+
+Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{irrlicht_version}.zip
 # Various fixes, optflags, system libraries/headers
 # http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
-Patch0:		irrlicht-1.7.1-optflags.patch
+Patch0:		irrlicht-1.8-optflags.patch
 # Get the code compiling
-Patch1:		irrlicht-1.5.1-glext.patch
+Patch1:		irrlicht-1.8-glext.patch
 # Use system libaesgm
-Patch2:		irrlicht-1.7.1-libaesgm.patch
+Patch2:		irrlicht18-libaesgm.patch
 # Use improved fastatof from assimp
-Patch3:		irrlicht-1.7.2-fastatof-improvements.patch
+# Upstream applied a modified version of most of this.
+# Patch3:	irrlicht18-fastatof-improvements-typefixes.patch
 # Make libIrrXML.so
-Patch4:		irrlicht-1.7.2-irrXML-shared-library.patch
+Patch4:		irrlicht-1.8-irrXML-shared-library.patch
+# Fix issue with definition of LOCALE_DECIMAL_POINTS
+Patch5:		irrlicht-1.8-fix-locale-decimal-points.patch
+# Fix build with Mesa 10
+Patch6:		irrlicht-1.8.1-mesa10.patch
 
-URL:		http://irrlicht.sourceforge.net/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
-BuildRequires:	libjpeg-devel, zlib-devel, libaesgm-devel
+BuildRequires:	libjpeg-turbo-devel, zlib-devel, libaesgm-devel
 BuildRequires:	libpng-devel, bzip2-devel, unzip
 
 %description
@@ -34,17 +43,19 @@ commercial 3d engines.
 
 %package devel
 Summary:	Development headers and libraries for irrlicht
+Summary(ja):	irrlicht の開発用ヘッダファイルとライブラリ
+Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	mesa-libGL-devel, mesa-libGLU-devel, libXxf86vm-devel
 Requires:	libjpeg-devel, zlib-devel, libpng-devel
 Requires:	irrXML-devel = %{irrxml_version}
-Group:		Development/Libraries
 
 %description devel
 Development headers and libraries for irrlicht.
 
 %package -n irrXML
 Summary:	Simple and fast XML parser for C++
+Summary(ja):	C++ 用のシンプルかつ高速な XML パーサ
 Group:		System Environment/Libraries
 Version:	%{irrxml_version}
 
@@ -53,9 +64,10 @@ irrXML is a simple and fast open source xml parser for C++.
 
 %package -n irrXML-devel
 Summary:	Development headers and libraries for irrXML
+Summary(ja):	irrXML の開発用ヘッダファイルとライブラリ
 Version:	%{irrxml_version}
-Requires:	irrXML = %{irrxml_version}-%{release}
 Group:		Development/Libraries
+Requires:	irrXML = %{irrxml_version}-%{release}
 
 %description -n irrXML-devel
 Development headers and libraries for irrXML.
@@ -65,8 +77,13 @@ Development headers and libraries for irrXML.
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .glext
 %patch2 -p1 -b .libaesgm
-%patch3 -p1 -b .fastatof
+# %patch3 -p1 -b .fastatof
 %patch4 -p1 -b .irrXML
+%patch5 -p1 -b .fix-locale-decimal-points
+%patch6 -p1 -b .mesa10
+
+# Upstream forgot to increment VERSION_RELEASE to 1 in 1.8.1
+sed -i 's|VERSION_RELEASE = 0|VERSION_RELEASE = 1|g' source/Irrlicht/Makefile
 
 sed -i 's/\r//' readme.txt
 iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
@@ -80,6 +97,9 @@ for i in include/*.h doc/upgrade-guide.txt source/Irrlicht/*.cpp source/Irrlicht
 	touch -r changes.txt $i
 done
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1035757
+sed -i -e '/_IRR_MATERIAL_MAX_TEXTURES_/s/4/8/' include/IrrCompileConfig.h
+
 %build
 cd source/Irrlicht
 make %{?_smp_mflags} sharedlib
@@ -89,9 +109,11 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_includedir}/%{name}
 make -C source/Irrlicht INSTALL_DIR=%{buildroot}%{_libdir} install 
-cp -a include/* %{buildroot}%{_includedir}/%{name}/
+cp -a include/*.h %{buildroot}%{_includedir}/%{name}/
-cd %{buildroot}%{_libdir}
+pushd %{buildroot}%{_libdir}
-ln -s libIrrlicht.so.%{version} libIrrlicht.so.1
+ln -s libIrrlicht.so.%{irrlicht_version} libIrrlicht.so.1
+ln -s libIrrXML.so.%{irrlicht_version} libIrrXML.so.1
+popd
 
 %clean
 rm -rf %{buildroot}
@@ -138,6 +160,10 @@ rm -rf %{buildroot}
 %{_libdir}/libIrrXML*.so
 
 %changelog
+* Thu Jan 29 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.8.1-1
+- updated to 1.8.1
+- built on current VineSeed
+
 * Wed Mar 16 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 1.7.2-1
 - initial build for Vine Linux based of fedora development
 

k/kaffeine/kaffeine-vl.spec

@@ -8,7 +8,7 @@ Name:    kaffeine
 Summary: %{kde} media player
 Summary(ja): %{kde} メディアプレーヤー
 Version: 1.2.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: GPLv2+
 Group:   Applications/Multimedia
@@ -18,6 +18,7 @@ Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{versio
 Source1: kaffeine.png
 
 ## upstreamable patches
+Patch100: kaffeine-1.2.2-gcc47.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: desktop-file-utils
@@ -31,8 +32,6 @@ Requires: qt4-sqlite
 Obsoletes: kaffeine-libs < 1.0
 Obsoletes: kaffeine-devel < 1.0
 
-#Requires: kdelibs4 >= 4.4.0
-
 %description
 Kaffeine is a %{kde} media player.
 
@@ -40,11 +39,12 @@ Kaffeine is a %{kde} media player.
 %prep
 %setup -q -n kaffeine-%{version}
 
+%patch100 -p1 -b .gcc47
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
+%cmake \
-%{cmake} \
     -DCMAKE_BUILD_TYPE=release \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
     -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
@@ -82,9 +82,9 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-  update-desktop-database %{_datadir}/applications &>/dev/null
+    update-desktop-database %{_datadir}/applications &>/dev/null
-  touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %posttrans
@@ -103,8 +103,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/kde4/kaffeine.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
-
 %changelog
+* Thu Jan 29 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.2.2-2
+- added Patch100 (based on git)
+- built on current VineSeed
+
 * Sat Jun 25 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.2.2-1
 - new upstream release
 

lib/liba/libaesgm/libaesgm-vl.spec

@@ -1,18 +1,20 @@
 Name:		libaesgm
 Version:	20090429
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
-License:	BSD
 Summary:	Library implementation of AES (Rijndael) cryptographic methods
+
+License:	BSD
+Group:		System Environment/Libraries
 URL:		http://gladman.plushost.co.uk/oldsite/AES/index.php
+
 Source0:	http://gladman.plushost.co.uk/oldsite/AES/aes-src-29-04-09.zip
 Source1:	Makefile.aes
 # Add fileencryption support
 # http://www.gladman.me.uk/cryptography_technology/fileencrypt/
 Patch0:		libaesgm-20090429-fileencrypt.patch
-Group:		System Environment/Libraries
 
-BuildRequires:	unzip
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	unzip
 
 %description
 Library implementation of AES (Rijndael) cryptographic methods.
@@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libaesgm.so
 
 %changelog
+* Thu Jan 29 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 20090429-2
+- rebuilt on current VineSeed
+
 * Wed Mar 16 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 20090429-1
 - initial build for Vine Linux based of fedora development
 

m/mana/mana-vl.spec

@@ -2,7 +2,7 @@ Summary:	Kana-Kanji conversion engine
 Summary(ja):	仮名漢字変換エンジン
 Name:		mana
 Version:	0.2.1
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 
 License:	GPLv2
 Group:		System Environment/Libraries
@@ -12,10 +12,10 @@ Source:		mana-%{version}.tar.bz2
 Patch0:		mana-0.2.1-gdbm-1.8.0.patch
 Patch1:		mana-0.2.0-schoca-OCaml-mk.patch
 Patch2:		mana-0.2.0-prelude.patch
-#Patch3:		mana-0.2.0-Makefile-nc.patch
+#Patch3:	mana-0.2.0-Makefile-nc.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	ocaml, ocaml-camlp4, ocaml-findlib
+BuildRequires:	ocaml-camlp4-devel, ocaml-findlib
 BuildRequires:	gdbm-devel, automake14
 Requires:	gdbm
 
@@ -26,8 +26,7 @@ Distribution:	Vine Linux
 Mana is Kana-Kanji conversion engine using Hidden Markov Model.
 
 %description -l ja
-真字は、隠れマルコフモデルを用いて、より自然な変換結果を実現する
+真字は、隠れマルコフモデルを用いて、より自然な変換結果を実現する仮名漢字変換エンジンです。
-仮名漢字変換エンジンです。
 
 %prep
 %setup -q
@@ -39,7 +38,6 @@ iconv README -f euc-jp -t utf-8 -o README.utf8
 mv README.utf8 README
 
 %build
-#%%configure --disable-debug --disable-profile
 ./configure \
 	--prefix=%{_prefix} \
 	--exec-prefix=%{_exec_prefix} \
@@ -80,6 +78,14 @@ mv README.utf8 README
 %{_datadir}/mana
 
 %changelog
+* Thu Jan 29 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.2.1-3
+- rebuilt on current VineSeed
+- BR: ocaml-camlp4-devel instead of ocaml-camlp4
+
+* Sun May 22 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.2.1-2
+- rebuilt with current VineSeed
+- changed README encoding to UTF-8
+
 * Sun May 22 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.2.1-2
 - rebuilt with current VineSeed
 - changed README encoding to UTF-8

m/manadic/manadic-vl.spec

@@ -2,10 +2,10 @@ Summary:	manadic - A dictionaly for Mana
 Summary(ja):	真字用辞書
 Name:		manadic
 Version:	0.1.4
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 
 License:	distributable
-Group:		Applications/Text
+Group:		System Environment/Libraries
 URL:		http://sourceforge.jp/projects/shinji/
 
 Source:		manadic-%{version}.tar.bz2
@@ -48,6 +48,10 @@ This package contains a dictionaly for Mana.
 %{_libdir}/mana/dic/ipadic
 
 %changelog
+* Thu Jan 29 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.1.4-3
+- rebuilt on current VineSeed
+- moved to System Environment/Libraries
+
 * Sun May 22 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.1.4-2
 - rebuilt with current VineSeed
 

n/ndtpd/ndtpd-vl.spec

@@ -2,18 +2,24 @@ Summary: Server for accessing CD-ROM books with NDTP
 Summary(ja): NDTP を用いた CD-ROM 書籍をアクセスするためのサーバ
 Name: ndtpd
 Version: 3.1.5
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 License: GPLv2
-Group: System Environment/Daemons
+Group: Applications/Services
+URL: http://www.sra.co.jp/people/m-kasahr/ndtpd/
+
 Source: ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/%{name}-%{version}.tar.gz
 Source1: ndtpd
-URL: http://www.sra.co.jp/people/m-kasahr/ndtpd/
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: eb >= 3.3, zlib
+Requires: eb >= 3.3
-BuildRequires: eb-devel
+Requires: rsyslog
+BuildRequires: eb-devel >= 3.3
 BuildRequires: zlib-devel
+BuildRequires: nkf
+Requires(pre): grep shadow-utils
 Requires(post): grep /sbin/install-info
 Requires(preun): grep /sbin/install-info /sbin/chkconfig
+Requires(postun): grep shadow-utils
 
 Distribution: Vine Linux
 Vendor: Project Vine
@@ -43,6 +49,11 @@ EBXA, EBXA-C, S-EBXA および EPWING 形式の CD-ROM 書籍に対応してい
 %prep
 %setup -q
 
+mv README-ja README-ja.old
+mv UPGRADE-ja UPGRADE-ja.old
+nkf -w README-ja.old > README-ja
+nkf -w UPGRADE-ja.old > UPGRADE-ja
+
 %build
 ./configure --prefix=%{_prefix} \
     --sysconfdir=%{ndtpdconfdir} \
@@ -68,38 +79,38 @@ rm -rf %{buildroot}
 
 %pre
 if [ `grep ndtpgrp %{_sysconfdir}/group | wc -l` = 0 ]; then
-  %{_sbindir}/groupadd ndtpgrp
+    %{_sbindir}/groupadd ndtpgrp
 fi
 if [ `grep ndtpuser %{_sysconfdir}/passwd | wc -l` = 0 ]; then
-   %{_sbindir}/useradd -M -r -g ndtpgrp -d %{_localstatedir}/ndtpd \
+    %{_sbindir}/useradd -M -r -g ndtpgrp -d %{_localstatedir}/ndtpd \
-   -s "" -c "ndtpd" ndtpuser || :
+     -s "" -c "ndtpd" ndtpuser || :
 fi
 
 %post
 if [ -x /sbin/install-info ]; then
-  for i in $(ls %{_infodir}/ndtpd*); do
+    for i in $(ls %{_infodir}/ndtpd*); do
-    /sbin/install-info --info-dir=%{_infodir} $i
+	/sbin/install-info --info-dir=%{_infodir} $i
-  done
+    done
 fi
 if [ -x /bin/grep -a -f /etc/services ] ; then
-grep -q "^ndtp" /etc/services || \
+    grep -q "^ndtp" /etc/services || \
-echo "ndtp          2010/tcp       # added by ndtpd RPM" >>  /etc/services
+	echo "ndtp          2010/tcp       # added by ndtpd RPM" >>  /etc/services
 fi
 
-if [ -x /bin/grep -a -f /etc/syslog.conf ] ; then
+if [ -x /bin/grep -a -f /etc/rsyslog.conf ] ; then
-grep -q "ndtpd" /etc/syslog.conf || \
+    grep -q "ndtpd" /etc/rsyslog.conf || \
-echo "local0.info     %{_localstatedir}/ndtpd/log/ndtpd.log" >>  /etc/syslog.conf
+	echo "local0.info     %{_localstatedir}/ndtpd/log/ndtpd.log" >>  /etc/rsyslog.conf
+    kill -HUP `/sbin/pidof rsyslogd`
 fi
-kill -HUP `/sbin/pidof syslogd`
 
 if [ -x /bin/grep -a -f /etc/inetd.conf ] ; then
-grep -q "ndtp" /etc/inetd.conf || \
+    grep -q "ndtp" /etc/inetd.conf || \
-echo "#ndtp    stream  tcp     nowait  root    /usr/sbin/ndtpd   ndtpd --inetd" >>  /etc/inetd.conf
+	echo "#ndtp    stream  tcp     nowait  root    /usr/sbin/ndtpd   ndtpd --inetd" >>  /etc/inetd.conf
 fi
 #kill -HUP `/sbin/pidof inetd`
 if [ -x /bin/grep -a -f /etc/hosts.allow ] ; then
-grep -q "ndtp" /etc/hosts.allow || \
+    grep -q "ndtp" /etc/hosts.allow || \
-echo "ndtp: 127.0.0.1 : allow" >>  /etc/hosts.allow
+	echo "ndtp: 127.0.0.1 : allow" >>  /etc/hosts.allow
 fi
 
 #[ -x /sbin/chkconfig -a -x %{_initdir}/ndtpd ] && \
@@ -112,19 +123,20 @@ fi
 %preun
 if [ $1 = 0 ]; then
   if [ -x /sbin/install-info ]; then
-    for i in $(ls %{_infodir}/ndtpd*); do
+      for i in $(ls %{_infodir}/ndtpd*); do
-      /sbin/install-info --delete --info-dir=%{_infodir} $i
+	  /sbin/install-info --delete --info-dir=%{_infodir} $i
-    done
+      done
   fi
   [ -x /sbin/chkconfig -a -x %{_initdir}/ndtpd ] && \
-    /sbin/chkconfig --del ndtpd
+      /sbin/chkconfig --del ndtpd
   ls %{_localstatedir}/ndtpd/log/* &> /dev/null && \
-    rm -f %{_localstatedir}/ndtpd/log/*
+      rm -f %{_localstatedir}/ndtpd/log/*
-  if [ -x /bin/grep -a -f /etc/syslog.conf ] ; then
+
-      if grep -q "ndtpd" /etc/syslog.conf ; then
+  if [ -x /bin/grep -a -f /etc/rsyslog.conf ] ; then
-          grep -v "ndtpd" /etc/syslog.conf > /etc/syslog.new && \
+      if grep -q "ndtpd" /etc/rsyslog.conf ; then
-          mv -f /etc/syslog.new /etc/syslog.conf
+          grep -v "ndtpd" /etc/rsyslog.conf > /etc/rsyslog.new && \
-          kill -HUP `/sbin/pidof syslogd`
+              mv -f /etc/rsyslog.new /etc/rsyslog.conf
+          kill -HUP `/sbin/pidof rsyslogd`
       fi
   fi
 
@@ -163,6 +175,7 @@ fi
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog* NEWS README README-ja UPGRADE UPGRADE-ja
 %config %{ndtpdconfdir}/ndtpd.conf.sample
 %{_infodir}/ndtpd-ja.info*
 %{_infodir}/ndtpd.info*
@@ -174,9 +187,15 @@ fi
 %{_sbindir}/ndtpupgrade
 %{_initdir}/ndtpd
 %attr(-,ndtpuser,ndtpgrp) %{_localstatedir}/ndtpd
-%doc AUTHORS COPYING ChangeLog* INSTALL INSTALL-ja  NEWS README README-ja UPGRADE UPGRADE-ja
 
 %changelog
+* Thu Jan 29 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.1.5-5
+- rebuilt on current VineSeed
+- moved to Applications/Services Group
+- fixed README-ja, UPGRADE-ja encoding
+- updated %%post and %%preun script for rsyslog
+- added Requires: rsyslog
+
 * Sun Jan  2 2011 IWAI, Masaharu <iwai@alib.jp> 3.1.5-4
 - build with eb 4.4.3