rpms/speech-dispatcher/OLPC-2 import.log, 1.2, 1.3 speech-dispatcher.spec, 1.2, 1.3

[Hemant Goyal (hemantg)]

Author: hemantg

Update of /cvs/pkgs/rpms/speech-dispatcher/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23437/OLPC-2

Modified Files:
	import.log speech-dispatcher.spec 
Log Message:
Trying conditional build for OLPC branch



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Jul 2008 17:17:52 -0000	1.2
+++ import.log	14 Jul 2008 17:00:32 -0000	1.3
@@ -1,2 +1,3 @@
 speech-dispatcher-0_6_6-13_fc7:OLPC-2:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214288283
 speech-dispatcher-0_6_6-14_fc7:OLPC-2:speech-dispatcher-0.6.6-14.fc7.src.rpm:1215969412
+speech-dispatcher-0_6_6-15_fc7:OLPC-2:speech-dispatcher-0.6.6-15.fc7.src.rpm:1216053499


Index: speech-dispatcher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/speech-dispatcher.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- speech-dispatcher.spec	13 Jul 2008 17:17:52 -0000	1.2
+++ speech-dispatcher.spec	14 Jul 2008 17:00:32 -0000	1.3
@@ -1,8 +1,16 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
+%if 0%{?olpc}
+%bcond_without nas
+%bcond_without pulse
+%else
+%bcond_with nas
+%bcond_with pulse
+%endif
+
 Name:           speech-dispatcher
 Version:        0.6.6
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        To provide a high-level device independent layer for speech synthesis
 Group:          System Environment/Libraries
 
@@ -25,8 +33,11 @@
 BuildRequires:	flite-devel
 BuildRequires:	espeak-devel
 
-%if 1%{?olpc} >= 2
+%if %{with nas}
 Buildrequires:	nas-devel
+%endif
+
+%if %{with pulse}
 Buildrequires:	pulseaudio-lib-devel
 %endif
 
@@ -90,14 +101,8 @@
 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
 rm -rf $RPM_BUILD_ROOT
@@ -226,6 +231,10 @@
 
 %changelog
 
+* Mon Jul 14 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-15
+
+- testing conditional build with bcond again.
+
 * 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