# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1210971851 0
# Node ID 5cbd119b26afd594d80ed4b6d1d32b5fbbb18631
# Parent  6a5b746ddfeafde71c7bd2cd6f4081d53fc10652# Parent  493239b86bf66a3dece188edf84145839f34bde4
merge of '1e83e527c083d0177b89f95d8ac465b393e4991d'
     and '3ad9ca55d458cd83d7e8caa6bd25a68d3f253c2b'

diff -r 493239b86bf6 -r 5cbd119b26af libpurple/dbus-maybe.h
--- a/libpurple/dbus-maybe.h	Fri May 16 21:00:26 2008 +0000
+++ b/libpurple/dbus-maybe.h	Fri May 16 21:04:11 2008 +0000
@@ -8,6 +8,10 @@
 
 #ifdef HAVE_DBUS
 
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
+#define DBUS_API_SUBJECT_TO_CHANGE
+#endif
+
 #include "dbus-server.h"
 
 /* this provides a type check */
diff -r 493239b86bf6 -r 5cbd119b26af pidgin.spec.in
--- a/pidgin.spec.in	Fri May 16 21:00:26 2008 +0000
+++ b/pidgin.spec.in	Fri May 16 21:04:11 2008 +0000
@@ -226,6 +226,7 @@
                                     --sysconfdir=%{_sysconfdir} \
                                     --disable-schemas-install \
                                     %{!?_with_dbus:--disable-dbus} \
+                                    %{!?_with_avahi:--disable-avahi} \
                                     %{?_without_gstreamer:--disable-gstreamer} \
                                     %{?_without_gtkspell:--disable-gtkspell} \
                                     %{?_without_nm:--disable-nm} \