rpms/speech-dispatcher/F-9 import.log, 1.2, 1.3 speech-dispatcher.spec, 1.1, 1.2

[Hemant Goyal (hemantg)]

Author: hemantg

Update of /cvs/pkgs/rpms/speech-dispatcher/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31155/F-9

Modified Files:
	import.log speech-dispatcher.spec 
Log Message:
Trying Conditional Build for OLPC



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Jun 2008 07:12:13 -0000	1.2
+++ import.log	13 Jul 2008 17:46:23 -0000	1.3
@@ -1,2 +1,3 @@
 speech-dispatcher-0_6_6-13_fc7:HEAD:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214288030
 speech-dispatcher-0_6_6-13_fc7:F-9:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214550669
+speech-dispatcher-0_6_6-14_fc7:F-9:speech-dispatcher-0.6.6-14.fc7.src.rpm:1215971094


Index: speech-dispatcher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-9/speech-dispatcher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- speech-dispatcher.spec	24 Jun 2008 06:15:21 -0000	1.1
+++ speech-dispatcher.spec	13 Jul 2008 17:46:23 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           speech-dispatcher
 Version:        0.6.6
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        To provide a high-level device independent layer for speech synthesis
 Group:          System Environment/Libraries
 
@@ -21,12 +21,16 @@
 %else
 BuildRequires: python-setuptools
 %endif
+
 BuildRequires:	flite-devel
-#BuildRequires:	ibmtts-devel
 BuildRequires:	espeak-devel
+
+%if 1%{?olpc} >= 2
 Buildrequires:	nas-devel
-BuildRequires:	alsa-lib-devel
 Buildrequires:	pulseaudio-lib-devel
+%endif
+
+BuildRequires:	alsa-lib-devel
 BuildRequires:  dotconf-devel
 BuildRequires:	texinfo
 Requires(post): /sbin/chkconfig /sbin/install-info
@@ -85,8 +89,14 @@
 %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
+
+%if 1%{?olpc} >= 2
+%configure --disable-static --without-nas --without-pulse
+make %{?_smp_mflags}
+%else
 %configure --disable-static
 make %{?_smp_mflags}
+%endif
 
 
 %install
@@ -216,6 +226,11 @@
 
 %changelog
 
+* Mon Jul 13 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-14
+
+- conditional build required for OLPC Branch - Building without nas and 
+  pulse-audio support.
+
 * Mon Jun 23 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-13
 
 - changed permission of speech-dispatcherd to 0644 too.