From dda2d84c1434ba1952cbcd02121ebb98483a0d55 Mon Sep 17 00:00:00 2001 From: Stu Tomlinson Date: Jun 06 2007 20:54:40 +0000 Subject: - Enable Bonjour support (#242949) - Fix building against latest evolution-data-server --- diff --git a/pidgin-2.0.1-gevolution-fix.patch b/pidgin-2.0.1-gevolution-fix.patch new file mode 100644 index 0000000..8c1681c --- /dev/null +++ b/pidgin-2.0.1-gevolution-fix.patch @@ -0,0 +1,27 @@ +----------------------------------------------------------------- +Revision: a825e87da2ebbdbfb6607c333cbac975d1f8a9d1 +Ancestor: e3c8bffcba0e661f54f3be0a71a868b62aeee0fb +Author: nosnilmot@pidgin.im +Date: 2007-06-06T19:28:25 +Branch: im.pidgin.pidgin + +Modified files: + pidgin/plugins/gevolution/gevolution.c + +ChangeLog: + +don't #include , it is apparently an +implementation detail and not part of the libebook API, so we should not +be including it (and it is not installed in recent e-d-s) + +============================================================ +--- pidgin/plugins/gevolution/gevolution.c a1a4fffe59cac8aef2723a51c1e663c2e1188731 ++++ pidgin/plugins/gevolution/gevolution.c 9c184a8354b352418a5b5c4abee78e5d92a5e1d5 +@@ -38,7 +38,6 @@ + + #include + +-#include + #include + #include + diff --git a/pidgin.spec b/pidgin.spec index 35645f4..5552765 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -20,6 +20,8 @@ %define modular_x 1 # OPTION: dbus-glib split (FC6+) %define dbus_glib_splt 1 +# OPTION: Bonjour support (FC6+) +%define bonjour_support 1 # OPTION: Meanwhile integration (F7+) %define meanwhile_integration 1 # OPTION: Perl devel separated out (F7+) @@ -27,7 +29,7 @@ Name: pidgin Version: 2.0.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://pidgin.im/ @@ -56,6 +58,7 @@ Source1: purple-fedora-prefs.xml Patch100: pidgin-2.0.1-early-g_thread_init.patch Patch101: pidgin-2.0.1-purple-remote-syntax.patch Patch102: pidgin-2.0.1-purple-remote-oscar.patch +Patch103: pidgin-2.0.1-gevolution-fix.patch Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -133,6 +136,9 @@ BuildRequires: libXScrnSaver-devel %if %{dbus_glib_splt} BuildRequires: dbus-glib-devel >= 0.70 %endif +%if %{bonjour_support} +BuildRequires: avahi-compat-howl-devel +%endif # Meanwhile integration (F7+) %if %{meanwhile_integration} BuildRequires: meanwhile-devel @@ -279,6 +285,7 @@ and plugins. %patch100 -p0 %patch101 -p0 %patch102 -p0 +%patch103 -p0 %patch113 -p1 # Relabel internal version for support purposes @@ -490,6 +497,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 6 2007 Stu Tomlinson - 2.0.1-5 +- Enable Bonjour support (#242949) +- Fix building against latest evolution-data-server + * Tue Jun 5 2007 Stu Tomlinson - 2.0.1-4 - Fix purple-remote for AIM & ICQ accounts (#240589) - Add missing Requires to -devel packages