rpms/gyachi/devel gyachi.spec,1.6,1.7

[Gregory D Hosler (ghosler)]

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23502

Modified Files:
	gyachi.spec 
Log Message:
updated spec file to support F-7/8/9/10




Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gyachi.spec	16 Jun 2008 15:26:04 -0000	1.6
+++ gyachi.spec	16 Jun 2008 17:58:14 -0000	1.7
@@ -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:        3%{?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,17 +131,18 @@
 ALSA sound driver for gyachi
 
 
+%if 0%{!?_without_pulseaudio:1}
 %package        plugin-pulseaudio
 Summary:        pulseaudio sound driver
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Buildrequires:	libnotify-devel
+
 BuildRequires:	pulseaudio-libs-devel
 Requires:	pulseaudio-libs
 
 %description plugin-pulseaudio
 PulseAudio sound driver for gyachi
-
+%endif
 
 %package recre8-theme
 Summary:        GyachI Prototype theme
@@ -154,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}
 
 
@@ -226,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,-)
@@ -243,8 +254,9 @@
 
 
 %changelog
-* Mon Jun 16 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-3
+* 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
 
 * Tue May 20 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.32-3
 - added openssl-devel as dependency