[speech-dispatcher] - Disable NAS support, use PulseAudio by default

Thu Aug 5 06:32:31 UTC 2010

commit 25eabccf136a6a3198c2147ac10264f92d806c80
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Aug 5 07:32:20 2010 +0100

    - Disable NAS support, use PulseAudio by default

 speech-dispatcher.spec |   63 ++++++++++++++++++++++++++----------------------
 1 files changed, 34 insertions(+), 29 deletions(-)
---

diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec
index 0706ba5..5489228 100644
--- a/speech-dispatcher.spec
+++ b/speech-dispatcher.spec
@@ -2,7 +2,7 @@
 
 Name:          speech-dispatcher
 Version:       0.7
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       To provide a high-level device independent layer for speech synthesis
 Group:         System Environment/Libraries
 
@@ -15,15 +15,14 @@ Source0:       http://www.freebsoft.org/pub/projects/speechd/%{name}-%{version}.
 Source1:       speech-dispatcherd
 Patch0:        speech-dispatcher-fixdso.patch
 
-BuildRequires: python-setuptools-devel
-BuildRequires: espeak-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: dotconf-devel
-BuildRequires: texinfo
-Buildrequires: pulseaudio-lib-devel
-Buildrequires: glib2-devel
+BuildRequires: espeak-devel
 BuildRequires: flite-devel
-Buildrequires: nas-devel
+Buildrequires: glib2-devel
+Buildrequires: pulseaudio-lib-devel
+BuildRequires: python-setuptools-devel
+BuildRequires: texinfo
 
 %ifnarch s390 s390x
 BuildRequires: libraw1394
@@ -87,7 +86,7 @@ speechd python module
 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-flite --sysconfdir=%{_sysconfdir}
+%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
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -96,14 +95,14 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 #Install the Python Modules
 cd src/python/
 mkdir -p build/lib/speechd
-python setup.py install --root $RPM_BUILD_ROOT
+python setup.py install --root %{buildroot}
 
-chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/speechd/_test.py
+chmod 0755 %{buildroot}%{python_sitelib}/speechd/_test.py
 
 #Move to the base BUILD folder
 cd ../../
@@ -112,38 +111,41 @@ for dir in \
  config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ 
  do
   pushd $dir
-  make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+  make install DESTDIR=%{buildroot} INSTALL="install -p"
  popd
 done
 
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/
+mkdir -p %{buildroot}%{_initrddir}
+install -p -m 0755 %SOURCE1 %{buildroot}%{_initrddir}/
 
 #Rename certain generically named binaries
-mv $RPM_BUILD_ROOT%{_bindir}/long_message $RPM_BUILD_ROOT%{_bindir}/spd_long_message 
-mv $RPM_BUILD_ROOT%{_bindir}/run_test $RPM_BUILD_ROOT%{_bindir}/spd_run_test
+mv %{buildroot}%{_bindir}/long_message %{buildroot}%{_bindir}/spd_long_message 
+mv %{buildroot}%{_bindir}/run_test %{buildroot}%{_bindir}/spd_run_test
 
 #Remove %{_infodir}/dir file
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f %{buildroot}%{_infodir}/dir
 
 cd ../../
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 # Move the config files from /usr/share to /etc
-%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/clients
-%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/modules
-mv $RPM_BUILD_ROOT%{_datadir}/speech-dispatcher/conf/speechd.conf $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/
-mv $RPM_BUILD_ROOT%{_datadir}/speech-dispatcher/conf/clients/* $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/clients
-mv $RPM_BUILD_ROOT%{_datadir}/speech-dispatcher/conf/modules/* $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/modules
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/speech-dispatcher/clients
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/speech-dispatcher/modules
+mv %{buildroot}%{_datadir}/speech-dispatcher/conf/speechd.conf %{buildroot}%{_sysconfdir}/speech-dispatcher/
+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 $RPM_BUILD_ROOT/%{_datadir}/sounds/
+%{__rm} -rf %{buildroot}/%{_datadir}/sounds/
 
 # Create log dir
-%{__mkdir} -p -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/log/speech-dispatcher/
+%{__mkdir} -p -m 0700 %{buildroot}%{_localstatedir}/log/speech-dispatcher/
+
+# enable pulseaudio as default with a fallback to alsa
+sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{buildroot}%{_sysconfdir}/speech-dispatcher/speechd.conf
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post 
 /sbin/ldconfig
@@ -218,6 +220,9 @@ fi
 %{python_sitelib}/speechd*
 
 %changelog
+* Thu Aug  5 2010 Peter Robinson <pbrobinson at gmail.com> - 0.7-2
+- Disable NAS support, use PulseAudio by default
+
 * Tue Aug  3 2010 Peter Robinson <pbrobinson at gmail.com> - 0.7-1
 - New upstream 0.7 stable release
 
@@ -329,7 +334,7 @@ fi
 - Removed Epoch
 - Moved %%{_libdir}/lib*.so back to devel pacakge
 - Require dependecny on base pacakge is now set to %%{version}-%%{release} instead of %%{version}
-- removed --prefix=$RPM_BUILD_ROOT/%%{_prefix}  against configure macro.
+- removed --prefix=%{buildroot}/%%{_prefix}  against configure macro.
   -- -python subpackage does not build anymore.
 - removed python subpackag rules from SPEC file.
 
@@ -340,8 +345,8 @@ fi
 - using newest version of speech-dispatcher
 - updated %%{_libdir}/libspeechd.so.2.0.4 to %%{_libdir}/libspeechd.so.2.0.5
 - python packages are being generated correctly now
-- must force prefix=$RPM_BUILD_ROOT/%%{_prefix} to enable python packages to get installed correctly.
-- finding and deleting .*la files in $RPM_BUILD_ROOT to avoid unpackaged files error.
+- must force prefix=%{buildroot}/%%{_prefix} to enable python packages to get installed correctly.
+- finding and deleting .*la files in %{buildroot} to avoid unpackaged files error.
 
 * Sat Feb 16 2008   Hemant Goyal <goyal.hemant at gmail.com> 0.6.5-4
 - updated build root
