2015-02-17 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* brltty, flite: updated
	* speech-dispatcher: rebuilt
	


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

b/brltty/brltty-vl.spec

@@ -1,31 +1,35 @@
-%define pkg_version 4.2
-%define api_version 0.5.5
+%define pkg_version 5.2
+%define api_version 0.6.3
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")}
 
-%define _exec_prefix %{nil}
-%define _libdir /%{_lib}
+%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
+
+#define _exec_prefix %{nil}
+#define _libdir /%{_lib}
 
 # with speech dispatcher iff on Fedora:
-%define with_speech_dispatcher 0%{?fedora}
+%define with_speech_dispatcher 1
+%define with_ocaml 1
 
 Name: brltty
 Version: %{pkg_version}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
+Summary: Braille display driver for Linux/Unix
+
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
-Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
-Patch0: brltty-cppflags.patch
-Patch1: brltty-autoconf-quote.patch
-Patch2: brltty-4.2-S_ISCHR.patch
-Patch3: brltty-parallel.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Summary: Braille display driver for Linux/Unix
-BuildRequires: bison
-BuildRequires: flex
-BuildRequires: autoconf
+
+Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.xz
+Patch4: brltty-loadLibrary.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: bluez-libs-devel
+BuildRequires: byacc
+BuildRequires: gettext
+BuildRequires: glibc-kernheaders
 # work around a bug in the install process:
 Requires(post): coreutils
 
@@ -45,16 +49,35 @@ Group: System Environment/Daemons
 License: GPLv2+
 BuildRequires: speech-dispatcher-devel
 Requires: %{name} = %{pkg_version}-%{release}
+
 %description speech-dispatcher
 This package provides the Speech Dispatcher driver for BRLTTY.
 %endif
 
+%package docs
+Summary: Documentation for BRLTTY
+Summary(ja): BRLTTY のドキュメント
+Group: Documentation
+License: GPLv2+
+Requires: %{name} = %{pkg_version}-%{release}
+BuildArch: noarch
+
+%description docs
+This package provides the documentation for BRLTTY.
+
 %package xw
 Summary: XWindow driver for BRLTTY
 Group: System Environment/Daemons
 License: GPLv2+
-BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel
+BuildRequires: libSM-devel
+BuildRequires: libICE-devel
+BuildRequires: libX11-devel
+BuildRequires: libXaw-devel
+BuildRequires: libXext-devel
+BuildRequires: libXt-devel
+BuildRequires: libXtst-devel
 Requires: %{name} = %{pkg_version}-%{release}
+
 %description xw
 This package provides the XWindow driver for BRLTTY.
 
@@ -65,15 +88,18 @@ Group: System Environment/Daemons
 License: GPLv2+ and LGPLv2+
 BuildRequires: at-spi-devel
 Requires: %{name} = %{pkg_version}-%{release}
+
 %description at-spi
 This package provides the AtSpi driver for BRLTTY.
 
 %package -n brlapi
+Summary: Appliation Programming Interface for BRLTTY
+Summary(ja): BRLTTY の API
 Version: %{api_version}
 Group: Applications/System
 License: LGPLv2+
-Summary: Appliation Programming Interface for BRLTTY
 Requires: %{name} = %{pkg_version}-%{release}
+
 %description -n brlapi
 This package provides the run-time support for the Application
 Programming Interface to BRLTTY.
@@ -82,11 +108,12 @@ Install this package if you have an application which directly accesses
 a refreshable braille display.
 
 %package -n brlapi-devel
+Summary: Headers, static archive, and documentation for BrlAPI
+Summary(ja): BrlAPI の開発用ファイル
 Version: %{api_version}
-Group: Development/System
+Group: Development/Libraries
 License: LGPLv2+
 Requires: brlapi = %{api_version}-%{release}
-Summary: Headers, static archive, and documentation for BrlAPI
 
 %description -n brlapi-devel
 This package provides the header files, static archive, shared object
@@ -101,77 +128,137 @@ Install this package if you are developing or maintaining an application
 which directly accesses a refreshable braille display.
 
 %package -n tcl-brlapi
+Summary: Tcl binding for BrlAPI
+Summary(ja): BrlAPI の Tcl バインディング
 Version: %{api_version}
-Group: Development/System
+Group: Development/Libraries
 License: LGPLv2+
+BuildRequires: tcl-devel
 Requires: brlapi = %{api_version}-%{release}
-BuildRequires: tcl
-Summary: Tcl binding for BrlAPI
+
 %description -n tcl-brlapi
 This package provides the Tcl binding for BrlAPI.
 
 %package -n python-brlapi
+Summary: Python binding for BrlAPI
+Summary(ja): BrlAPI の Python バインディング
 Version: %{api_version}
-Group: Development/System
+Group: Development/Libraries
 License: LGPLv2+
+BuildRequires: Cython
+BuildRequires: python-devel
+BuildRequires: python-setuptools
 Requires: brlapi = %{api_version}-%{release}
-BuildRequires: python-pyrex
-Summary: Python binding for BrlAPI
+
 %description -n python-brlapi
 This package provides the Python binding for BrlAPI.
 
 %package -n brlapi-java
+Summary: Java binding for BrlAPI
+Summary(ja): BrlAPI の Java バインディング
 Version: %{api_version}
-Group: Development/System
+Group: Development/Libraries
 License: LGPLv2+
 Requires: brlapi = %{api_version}-%{release}
 ## temporary work around, java-devel is not resolved consistently acrss archs
 BuildRequires: java-devel
 #BuildRequires: java-1.5.0-gcj-devel
-Summary: Java binding for BrlAPI
+
 %description -n brlapi-java
 This package provides the Java binding for BrlAPI.
 
+%if %{with_ocaml}
+%package -n ocaml-brlapi
+Summary: OCaml binding for BrlAPI
+Summary(ja): BrlAPI の OCaml バインディング
+Version: %{api_version}
+Group: Development/Libraries
+License: LGPLv2+
+Requires: brlapi = %{api_version}-%{release}
+BuildRequires: ocaml
+BuildRequires: ocaml-findlib
+
+%description -n ocaml-brlapi
+This package provides the OCaml binding for BrlAPI.
+%endif
+
+
 %define version %{pkg_version}
 
 %prep
 %setup -q
-%patch0 -p1 -b .cppflags
-%patch1 -p1 -b .quote
-%patch2 -p1 -b .S_ISCHR
-%patch3 -p1 -b .parallel
+%patch4 -p1 -b .loadLibrary
+#patch5 -p1
 
 %build
-# Patch6 changes aclocal.m4:
-autoconf
+# If MAKEFLAGS=-jN is set it would break local builds.
+unset MAKEFLAGS
+
+# Add the openjdk include directories to CPPFLAGS
 for i in -I/usr/lib/jvm/java/include{,/linux}; do
       java_inc="$java_inc $i"
 done
+export CPPFLAGS="$java_inc"
+
+export CFLAGS="%{optflags} -I%{_includedir}/speech-dispatcher -fno-strict-aliasing"
+export CXXFLAGS="%{optflags} -I%{_includedir}/speech-dispatcher -fno-strict-aliasing"
+
 # there is no curses packages in BuildRequires, so the package builds
 # without them in mock; let's express this decision explicitly
-%configure CPPFLAGS="$java_inc" --disable-stripping --without-curses \
+%configure \
+    --disable-stripping \
+    --without-curses \
 %if %{with_speech_dispatcher}
   --with-speechd=%{_prefix} \
 %endif
-  --with-install-root="${RPM_BUILD_ROOT}"
-make %{?_smp_mflags}
+  --with-install-root=$RPM_BUILD_ROOT \
+  JAVA_JAR_DIR=%{_jnidir} \
+  JAVA_JNI_DIR=%{_libdir}/brltty \
+  JAVA_JNI=yes \
+  PYTHON=%{__python}
+
+# Parallel build seems broken, thus disabling it
+make
 
 find . \( -path ./doc -o -path ./Documents \) -prune -o \
   \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o \
      -name '*.sgml' -o -name '*.patch' -o \
-     \( -path './Bootdisks/*' -type f -perm +ugo=x \) \) -print |
+     \( -path './Bootdisks/*' -type f -perm /ugo=x \) \) -print |
 while read file; do
    mkdir -p doc/${file%/*} && cp -rp $file doc/$file || exit 1
 done
 
+find . -name '*.sgml' |
+while read file; do
+   iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file
+done
+find . -name '*.txt' |
+while read file; do
+   iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file
+done
+find . -name 'README*' |
+while read file; do
+   iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file
+done
+
+# backup Documents
+cp -a Documents Documents.buildsnap
+
 %install
 rm -rf $RPM_BUILD_ROOT
-# does not seem to be parallel safe
-make install
-rm "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.so"
-ln -s ../../%{_lib}/libbrlapi.so "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/"
-install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5"
-install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}"
+rm -rf Documents
+cp -a Documents.buildsnap Documents
+
+%if %{with_ocaml}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+%endif
+
+make install JAVA_JAR_DIR=%{_jnidir} \
+             JAVA_JNI_DIR=%{_libdir}/brltty \
+             JAVA_JNI=yes
+
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_mandir}/man5
+install -m 644 Documents/brltty.conf ${RPM_BUILD_ROOT}%{_sysconfdir}
 echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5
 
 # clean up the manuals:
@@ -179,7 +266,16 @@ rm Documents/Manual-*/*/{*.mk,*.made,Makefile*}
 mv Documents/BrlAPIref/{html,BrlAPIref}
 
 # Don't want static lib
-rm -rf $RPM_BUILD_ROOT/%{_lib}/libbrlapi.a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libbrlapi.a
+
+# ghost brlapi.key
+touch $RPM_BUILD_ROOT%{_sysconfdir}/brlapi.key
+
+# disable xbrlapi gdm autostart, there is already orca
+rm -f $RPM_BUILD_ROOT%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop
+
+# handle locales
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -197,19 +293,30 @@ do
 done
 if $install
 then
-   device="$(set -- ${devices} && echo "${1}")"
-   mkdir -p "${device%/*}"
-   mknod -m o= "${device}" c 7 128
-   chmod 660 "${device}"
-   chown root.tty "${device}"
+    device="$(set -- ${devices} && echo "${1}")"
+    mkdir -p "${device%/*}"
+    mknod -m o= "${device}" c 7 128
+    chmod 660 "${device}"
+    chown root.tty "${device}"
 fi
 exit 0
 
-%post   -n brlapi -p /sbin/ldconfig
+%pre -n brlapi
+getent group brlapi >/dev/null || groupadd -r brlapi >/dev/null
+
+%post -n brlapi
+if [ ! -e %{_sysconfdir}/brlapi.key ]; then
+    mcookie > %{_sysconfdir}/brlapi.key
+    chgrp brlapi %{_sysconfdir}/brlapi.key
+    chmod 0640 %{_sysconfdir}/brlapi.key
+fi
+/sbin/ldconfig
+
 %postun -n brlapi -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
+%doc LICENSE-GPL LICENSE-LGPL
 %config(noreplace) %{_sysconfdir}/brltty.conf
 %{_sysconfdir}/brltty/
 %{_bindir}/brltty
@@ -217,51 +324,60 @@ exit 0
 %{_libdir}/brltty/
 %exclude %{_libdir}/brltty/libbrlttybba.so
 %exclude %{_libdir}/brltty/libbrlttybxw.so
+%exclude %{_libdir}/brltty/libbrlapi_java.so
 %if %{with_speech_dispatcher}
 %exclude %{_libdir}/brltty/libbrlttyssd.so
 %endif
 %exclude %{_libdir}/brltty/libbrlttyxas.so
-%doc LICENSE-GPL LICENSE-LGPL
-%doc Documents/ChangeLog Documents/TODO
-%doc Documents/Manual-BRLTTY/
-%doc doc/*
-%doc %{_mandir}/man[15]/brltty.*
+%{_mandir}/man[15]/brltty.*
 
 %if %{with_speech_dispatcher}
 %files speech-dispatcher
+%defattr(-,root,root)
 %doc Drivers/Speech/SpeechDispatcher/README
 %{_libdir}/brltty/libbrlttyssd.so
 %endif
 
+%files docs
+%defattr(-,root,root)
+%doc Documents/ChangeLog Documents/TODO
+%doc Documents/Manual-BRLTTY/
+%doc doc/*
+
 %files xw
+%defattr(-,root,root)
 %doc Drivers/Braille/XWindow/README
 %{_libdir}/brltty/libbrlttybxw.so
 
 %files at-spi
+%defattr(-,root,root)
 %{_libdir}/brltty/libbrlttyxas.so
 
 %files -n brlapi
 %defattr(-,root,root)
+%doc Drivers/Braille/XWindow/README
+%doc Documents/Manual-BrlAPI/
+%ghost %{_sysconfdir}/brlapi.key
 %{_bindir}/vstp
+%{_bindir}/eutp
 %{_bindir}/xbrlapi
 %{_libdir}/brltty/libbrlttybba.so
 %{_libdir}/libbrlapi.so.*
-%doc Drivers/Braille/XWindow/README
-%doc Documents/Manual-BrlAPI/
-%doc %{_mandir}/man1/xbrlapi.*
-%doc %{_mandir}/man1/vstp.*
+%{_mandir}/man1/xbrlapi.*
+%{_mandir}/man1/vstp.*
+%{_mandir}/man1/eutp.*
 
 %files -n brlapi-devel
 %defattr(-,root,root)
-%{_prefix}/%{_lib}/libbrlapi.so
+%doc Documents/BrlAPIref/BrlAPIref/
+%{_libdir}/libbrlapi.so
 %{_includedir}/brltty
 %{_includedir}/brlapi*.h
-%doc %{_mandir}/man3/brlapi_*.3*
-%doc Documents/BrlAPIref/BrlAPIref/
+%{_mandir}/man3/brlapi_*.3*
 
 %files -n tcl-brlapi
 %defattr(-,root,root)
-%{_prefix}/%{_lib}/brlapi-%{api_version}
+%{_libdir}/tcl%{tcl_version}/brlapi-%{api_version}
 
 %files -n python-brlapi
 %defattr(-,root,root)
@@ -270,19 +386,28 @@ exit 0
 
 %files -n brlapi-java
 %defattr(-,root,root)
-%{_jnidir}/libbrlapi_java.so
-%{_javadir}/brlapi.jar
+%{_libdir}/brltty/libbrlapi_java.so
+%{_jnidir}/brlapi.jar
+
+%if %{with_ocaml}
+%files -n ocaml-brlapi
+%defattr(-,root,root)
+%{_libdir}/ocaml/brlapi/
+%{_libdir}/ocaml/stublibs/
+%endif
 
 
 %changelog
+* Tue Feb 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 5.2-1
+- updated to 5.2
+- added speech-dispatcher, doc, and ocaml subpackages
+
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.2-2
 - rebuild with python-2.7.2
 
 * Sat Nov 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.2-1
 - initial build for Vine Linux
 
-
-
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

f/flite/flite-vl.spec

@@ -1,22 +1,24 @@
 Name:           flite
-Version:        1.3
-Release:        16%{?_dist_release}
+Version:        2.0.0
+Release:        1%{?_dist_release}
 Summary:        Small, fast speech synthesis engine (text-to-speech)
 Summary(ja):    合成音声出力の軽量高速エンジン
 
 Group:          Applications/Multimedia
 License:        MIT
 URL:            http://fife.speech.cs.cmu.edu/flite/
-Source0:        http://fife.speech.cs.cmu.edu/flite/packed/%{name}-%{version}/%{name}-%{version}-release.tar.gz
-Source1:        README-ALSA.txt
-Patch0:         flite-1.3-sharedlibs.patch
-Patch1:         flite-1.3-doc_texinfo.patch
-Patch2:         flite-1.3-alsa_support.patch
+Source0:        http://fife.speech.cs.cmu.edu/flite/packed/%{name}-%{version}/%{name}-%{version}-release.tar.bz2
+#Source1:        README-ALSA.txt
+#Patch0:         flite-1.3-sharedlibs.patch
+#Patch1:         flite-1.3-doc_texinfo.patch
+#Patch2:         flite-1.3-alsa_support.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  ed alsa-lib-devel autoconf
+#BuildRequires:  ed alsa-lib-devel autoconf
+BuildRequires:  pulseaudio-libs-devel
 
-Distribution:     Vine Linux
-Vendor:           Project Vine
+Distribution:    Vine Linux
+Vendor:          Project Vine
 
 %description
 Flite (festival-lite) is a small, fast run-time speech synthesis engine
@@ -34,7 +36,7 @@ Fliteは、FestVox音声合成ツールによって作成されたFestivalの軽
 Summary: Development files for flite
 Summary: flite の開発用ファイル
 Group: Development/Libraries
-Requires: flite = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 Development files for Flite, a small, fast speech synthesis engine.
@@ -44,22 +46,20 @@ Development files for Flite, a small, fast speech synthesis engine.
 
 %prep
 %setup -q -n %{name}-%{version}-release
-%patch0 -p1 -b .flite-1.3-sharedlibs
-%patch1 -p1 -b .flite-1.3-doc_texinfo
-%patch2 -p1 -b .flite-1.3-alsa_support
-cp -p %{SOURCE1} .
+#patch0 -p1 -b .flite-1.3-sharedlibs
+#patch1 -p1 -b .flite-1.3-doc_texinfo
+#patch2 -p1 -b .flite-1.3-alsa_support
+#cp -p %{SOURCE1} .
 
 
 %build
-autoconf
-%configure --enable-shared --with-audio=alsa
-# This package fails parallel make (thus cannot be built using "_smp_flags")
-make
+#autoconf
+%configure --disable-static --enable-shared --with-audio=pulseaudio
+make %{?_smp_flags}
 
 %install
 rm -rf %{buildroot}
-make install INSTALLBINDIR=%{buildroot}%{_bindir} INSTALLLIBDIR=%{buildroot}%{_libdir}  INSTALLINCDIR=%{buildroot}%{_includedir}/flite
-
+make install DESTDIR=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -71,17 +71,21 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ACKNOWLEDGEMENTS README COPYING README-ALSA.txt
+%doc ACKNOWLEDGEMENTS README COPYING
 %{_bindir}/*
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.so
 %{_includedir}/flite
-
+%{_libdir}/*.so
+%exclude %{_libdir}/*.a
 
 %changelog
+* Tue Feb 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 2.0-1
+- updated to 2.0
+- BR: pulseaudio-libs-devel instead of alsa-lib-devel
+
 * Sun Aug 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.3-16
 - added Japanese summary based on 1.3-0vl2 (VinePlus/4.0(extras))
 - merged changelog from 1.3-0vl2

s/speech-dispatcher/speech-dispatcher-vl.spec

@@ -4,7 +4,7 @@
 
 Name:           speech-dispatcher
 Version:        0.8.1
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        To provide a high-level device independent layer for speech synthesis
 Group:          System Environment/Libraries
 
@@ -22,7 +22,7 @@ BuildRequires: alsa-lib-devel
 BuildRequires: dotconf-devel
 BuildRequires: texinfo
 BuildRequires: libraw1394-devel
-BuildRequires: pulseaudio-lib-devel
+BuildRequires: pulseaudio-libs-devel
 BuildRequires: libao-devel
 BuildRequires: glib2-devel
 BuildRequires: flite-devel
@@ -52,9 +52,10 @@ Obsoletes:	%{name}-python < 0.8.0
 
 %package        devel
 Summary:        Development files for %{name}
+Summary(ja):    %{name} の開発用ファイル
 Group:          Development/Libraries
-Requires:       speech-dispatcher = %{version}-%{release}
 License:        GPLv2+
+Requires:       speech-dispatcher = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -62,8 +63,10 @@ developing applications that use %{name}.
 
 %package doc
 Summary:        Documentation for speech-dispatcher
+Summary(ja):    speech-dispatcher のドキュメント
 License:        GPLv2+
 Group:          Applications/Documentation
+BuildArch:      noarch
 Requires:       speech-dispatcher = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun):/sbin/install-info
@@ -76,6 +79,8 @@ speechd documentation
 %setup -q
 
 %build
+# only for configure
+export LIBS="-lpulse -lpulse-simple"
 %configure \
 	--disable-static \
 	--with-alsa \
@@ -91,10 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 for dir in \
  config/ doc/ include/ src/audio/ src/api/ src/modules/ src/tests/ src/server/ src/clients/
- do
-  pushd $dir
-  make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
- popd
+do
+    pushd $dir
+    make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+    popd
 done
 
 #Install the init shell script
@@ -139,8 +144,8 @@ fi
 
 %preun
 if [ $1 = 0 ] ; then
- /sbin/service speech-dispatcherd stop >/dev/null 2>&1
- /sbin/chkconfig --del speech-dispatcherd
+    /sbin/service speech-dispatcherd stop >/dev/null 2>&1
+    /sbin/chkconfig --del speech-dispatcherd
 fi
 
 %post doc
@@ -151,10 +156,10 @@ fi
 
 %preun doc
 if [ $1 = 0 ]; then
- /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
- /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || :
- /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || :
- /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || :
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+    /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || :
+    /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || :
+    /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || :
 fi
 
 
@@ -190,6 +195,10 @@ fi
 
 
 %changelog
+* Tue Feb 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.8.1-2
+- rebuilt with flite 2.0
+- changed doc subpackage to noarch
+
 * Sun Dec 07 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.8.1-1
 - new upstream release
 - remove %%{name}-python subpackage