[speech-dispatcher/f14/master] New upstream 0.7.1 stable release

[Peter Robinson]

commit 4bc678432da1ef556b12b0b36afccccafbe65263
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Sep 14 00:30:03 2010 +0100

    New upstream 0.7.1 stable release

 .gitignore                     |    1 +
 sources                        |    2 +-
 speech-dispatcher-fixdso.patch |   11 --------
 speech-dispatcher.spec         |   54 +++++++++++++--------------------------
 4 files changed, 20 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af957e6..8be71cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 speech-dispatcher-0.6.7.tar.gz
 speech-dispatcher-0.7.tar.gz
+/speech-dispatcher-0.7.1.tar.gz
diff --git a/sources b/sources
index a496853..1bedb96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e0d833c680c8217cc40d88c68c5265f  speech-dispatcher-0.7.tar.gz
+ccfc30ac006673d36b4223eb760ed696  speech-dispatcher-0.7.1.tar.gz
diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec
index 5489228..deb6032 100644
--- a/speech-dispatcher.spec
+++ b/speech-dispatcher.spec
@@ -1,8 +1,9 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+# sitelib for noarch packages, sitearch for others (remove the unneeded one)
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:          speech-dispatcher
-Version:       0.7
-Release:       2%{?dist}
+Version:       0.7.1
+Release:       1%{?dist}
 Summary:       To provide a high-level device independent layer for speech synthesis
 Group:         System Environment/Libraries
 
@@ -13,13 +14,13 @@ License:       GPLv2+ and GPLv2
 URL:           http://www.freebsoft.org/pub/projects/speechd/
 Source0:       http://www.freebsoft.org/pub/projects/speechd/%{name}-%{version}.tar.gz
 Source1:       speech-dispatcherd
-Patch0:        speech-dispatcher-fixdso.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: dotconf-devel
 BuildRequires: espeak-devel
 BuildRequires: flite-devel
 Buildrequires: glib2-devel
+Buildrequires: libao-devel
 Buildrequires: pulseaudio-lib-devel
 BuildRequires: python-setuptools-devel
 BuildRequires: texinfo
@@ -79,13 +80,8 @@ speechd python module
 
 %prep
 %setup -q
-# patch needs further review as it has olpc specific changes in it.
-%patch0 -p1 -b .fixdso
 
 %build
-iconv -f ISO-8859-2 -t UTF-8 doc/speech-dispatcher-cs.texi -o doc/speech-dispatcher-cs_c.texi
-mv doc/speech-dispatcher-cs_c.texi doc/speech-dispatcher-cs.texi
-
 %configure --disable-static --with-alsa --with-pulse --without-nas --with-flite --sysconfdir=%{_sysconfdir}
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@@ -97,18 +93,8 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 
-#Install the Python Modules
-cd src/python/
-mkdir -p build/lib/speechd
-python setup.py install --root %{buildroot}
-
-chmod 0755 %{buildroot}%{python_sitelib}/speechd/_test.py
-
-#Move to the base BUILD folder
-cd ../../
-
 for dir in \
- config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ 
+ config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ src/python/
  do
   pushd $dir
   make install DESTDIR=%{buildroot} INSTALL="install -p"
@@ -135,9 +121,6 @@ mv %{buildroot}%{_datadir}/speech-dispatcher/conf/speechd.conf %{buildroot}%{_sy
 mv %{buildroot}%{_datadir}/speech-dispatcher/conf/clients/* %{buildroot}%{_sysconfdir}/speech-dispatcher/clients
 mv %{buildroot}%{_datadir}/speech-dispatcher/conf/modules/* %{buildroot}%{_sysconfdir}/speech-dispatcher/modules
 
-# Remove dummy sound
-%{__rm} -rf %{buildroot}/%{_datadir}/sounds/
-
 # Create log dir
 %{__mkdir} -p -m 0700 %{buildroot}%{_localstatedir}/log/speech-dispatcher/
 
@@ -167,26 +150,21 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS README COPYING
-
-%config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf
-%config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf
-%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf
-
 %dir %{_sysconfdir}/speech-dispatcher/
 %dir %{_sysconfdir}/speech-dispatcher/clients
 %dir %{_sysconfdir}/speech-dispatcher/modules
-
+%config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf
+%config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf
+%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf
 %{_bindir}/*
-
-%{_libdir}/speech-dispatcher-modules/sd_*
-%dir %{_libdir}/speech-dispatcher-modules
-
 %{_libdir}/libspeechd.so.2
-%{_libdir}/libspeechd.so.2.2.1
+%{_libdir}/libspeechd.so.2.3.0
+%{_libdir}/speech-dispatcher-modules/
 %dir %{_libdir}/speech-dispatcher
 %{_libdir}/speech-dispatcher/lib*.so
 %{_libdir}/speech-dispatcher/libsdaudio.so.2
-%{_libdir}/speech-dispatcher/libsdaudio.so.2.0.3
+%{_libdir}/speech-dispatcher/libsdaudio.so.2.0.4
+%{_datadir}/sounds/speech-dispatcher
 
 %dir %attr(0700, root, root) %{_localstatedir}/log/speech-dispatcher/
 
@@ -217,9 +195,13 @@ fi
 
 %files python
 %defattr(-,root,root,-)
-%{python_sitelib}/speechd*
+%{python_sitearch}/speechd*
 
 %changelog
+* Tue Sep 14 2010 Peter Robinson <pbrobinson at gmail.com> - 0.7.1-1
+- New upstream 0.7.1 stable release
+- Some spec and build cleanups
+
 * Thu Aug  5 2010 Peter Robinson <pbrobinson at gmail.com> - 0.7-2
 - Disable NAS support, use PulseAudio by default