rpms/gyachi/F-7 gyachi.spec,1.4,1.5

[Gregory D Hosler (ghosler)]

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15006

Modified Files:
	gyachi.spec 
Log Message:
disable pulseaudio for F7




Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-7/gyachi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gyachi.spec	16 Jun 2008 16:43:50 -0000	1.4
+++ gyachi.spec	16 Jun 2008 17:07:16 -0000	1.5
@@ -1,6 +1,14 @@
+%ifnarch i386
+%define _without_wine 1
+%endif
+
+%if 0%{?fc7}
+%define _without_pulseaudio 1
+%endif
+
 Name:           gyachi
 Version:        1.1.35
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Yahoo! chat client with Webcam and voice support
 
 Group:          Applications/Internet
@@ -21,7 +29,6 @@
 BuildRequires:	gtk2-devel >= 2.4.0
 BuildRequires:	jasper-devel >= 1.701.0
 
-
 #jasper >= 1.701 needed for memory leak fix.
 %if 0%{?fc7}
 Requires:	jasper >= 1.701.0
@@ -124,8 +131,7 @@
 ALSA sound driver for gyachi
 
 
-%if 0%{?fc7}
-%else
+%if 0%{!?_without_pulseaudio:1}
 %package        plugin-pulseaudio
 Summary:        pulseaudio sound driver
 Group:          Applications/Internet
@@ -156,11 +162,12 @@
 %build
 ./autogen.sh
 
-%ifarch i386
-%configure --disable-rpath --enable-v4l2 --enable-plugin_photo_album --enable-plugin_xmms --libexecdir=%{_libexecdir}/gyachi
-%else
-%configure --disable-rpath --enable-v4l2 --enable-plugin_photo_album --enable-plugin_xmms --libexecdir=%{_libexecdir}/gyachi --disable-wine
-%endif
+%configure --disable-rpath --enable-v4l2 \
+	   --enable-plugin_photo_album \
+	   --enable-plugin_xmms \
+	   %{?_without_wine:--disable-wine} \
+	   %{?_without_pulseaudio:--disable-plugin_pulseaudio} \
+	   --libexecdir=%{_libexecdir}/gyachi
 make %{?_smp_mflags}
 
 
@@ -228,9 +235,11 @@
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/%{name}alsa.so
 
+%if 0%{!?_without_pulseaudio:1}
 %files plugin-pulseaudio
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/%{name}pulseaudio.so
+%endif
 
 %files recre8-theme
 %defattr(-,root,root,-)
@@ -245,7 +254,7 @@
 
 
 %changelog
-* Mon Jun 16 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-5
+* Mon Jun 16 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-6
 - Made Alsa driver a plugin, added pulseaudio support as a plugin.
 - Disabled pulseaudio plugin for F7