packages: speech-dispatcher/speech-dispatcher.spec - unify pulseaudio bcond

[glen]

Author: glen                         Date: Tue Jul 13 14:45:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify pulseaudio bcond

---- Files affected:
packages/speech-dispatcher:
   speech-dispatcher.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: packages/speech-dispatcher/speech-dispatcher.spec
diff -u packages/speech-dispatcher/speech-dispatcher.spec:1.19 packages/speech-dispatcher/speech-dispatcher.spec:1.20
--- packages/speech-dispatcher/speech-dispatcher.spec:1.19	Fri Jul  9 13:24:39 2010
+++ packages/speech-dispatcher/speech-dispatcher.spec	Tue Jul 13 16:45:43 2010
@@ -6,7 +6,7 @@
 %bcond_without	espeak		# espeak synthetizer support
 %bcond_without	nas		# NAS audio output support
 %bcond_without	alsa		# ALSA audio output supprot
-%bcond_without	pulse		# pulse audio output support
+%bcond_without	pulseaudio		# pulse audio output support
 %bcond_without	static_libs	# don't build static libraries
 %bcond_without	ivona	# don't build ivona support
 #
@@ -33,22 +33,22 @@
 %{?with_flite:BuildRequires:	flite-devel}
 %{?with_ibmtts:BuildRequires:	ibmtts-devel}
 BuildRequires:	libatomic_ops
-BuildRequires:	libtool
 %{?with_ivona:BuildRequires:	libdumbtts-devel}
+BuildRequires:	libtool
 %{?with_nas:BuildRequires:	nas-devel}
 BuildRequires:	pkgconfig
-%{?with_pulse:BuildRequires:	pulseaudio-devel}
+%{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	texinfo
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(post,preun):	/sbin/chkconfig
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rc-scripts
 Provides:	group(%{name})
@@ -134,7 +134,7 @@
 	%{?with_espeak:--with-espeak}%{!?with_espeak:--without-espeak} \
 	%{?with_nas:--with-nas}%{!?with_nas:--without-nas} \
 	%{?with_alsa:--with-alsa}%{!?with_alsa:--without-alsa} \
-	%{?with_pulse:--with-pulse}%{!?with_pulse:--without-pulse} \
+	%{?with_pulseaudio:--with-pulse}%{!?with_pulseaudio:--without-pulse} \
 	%{?with_ivona:--with-ivona}%{!?with_ivona:--without-ivona} \
 	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
 
@@ -236,6 +236,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2010/07/13 14:45:43  glen
+- unify pulseaudio bcond
+
 Revision 1.19  2010/07/09 11:24:39  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/speech-dispatcher/speech-dispatcher.spec?r1=1.19&r2=1.20&f=u