rpms/gaim/devel gaim.spec,1.159,1.160

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25554

Modified Files:
	gaim.spec 
Log Message:
Spec cleanup...
- modular X is only FC5+
- libao and audiofile are no longer used for sound output, in favor of gstreamer



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- gaim.spec	5 Dec 2006 19:49:17 -0000	1.159
+++ gaim.spec	5 Dec 2006 22:42:29 -0000	1.160
@@ -16,6 +16,8 @@
 %define gstreamer_integration	1
 # OPTION: NetworkManager integration (FC5+)
 %define nm_integration	        1
+# OPTION: Modular X (FC5+)
+%define modular_x               1
 # OPTION: dbus-glib split (FC6+)
 %define dbus_glib_splt		1
 
@@ -83,15 +85,13 @@
 
 # Basic Library Requirements
 BuildRequires:  autoconf
-BuildRequires:	libao-devel, startup-notification-devel, audiofile-devel
+BuildRequires:	startup-notification-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:	mozilla-nss-devel
 BuildRequires:	gtk2-devel
 BuildRequires:  gettext
-BuildRequires:  libXScrnSaver-devel
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
-BuildRequires:  libSM-devel
 BuildRequires:  ncurses-devel
 
 # Bug #212817 Jabber needs cyrus-sasl plugins for authentication
@@ -134,6 +134,11 @@
 BuildRequires:	NetworkManager-glib-devel
 %endif
 %endif
+# Modular X (FC5+)
+%if %{modular_x}
+BuildRequires:  libSM-devel
+BuildRequires:  libXScrnSaver-devel
+%endif
 # DBus GLIB Split (FC6+)
 %if %{dbus_glib_splt}
 BuildRequires:  dbus-glib-devel >= 0.70