# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1211042561 0
# Node ID 2a79e13aef4402bf08471a4fb4eb2fef8f47bba1
# Parent  307bab4c9e63237c324a004212036422b27f7bca# Parent  3bb677b57e4bda881cdd29e3dda1eade8dab70e9
merge of '4981895b0b7aadf94bcca49e105176b49f71d50d'
     and '6126637fa90f27a38f1df1bb798f333ee3311849'

diff -r 307bab4c9e63 -r 2a79e13aef44 ChangeLog
--- a/ChangeLog	Sat May 17 16:41:16 2008 +0000
+++ b/ChangeLog	Sat May 17 16:42:41 2008 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.x.x:
+version 2.4.2 (05/17/2008):
 	libpurple:
 	* In MySpaceIM, messages from spambots are discarded (Justin Williams)
 	* Strip mIRC formatting codes from quit and part messages.
diff -r 307bab4c9e63 -r 2a79e13aef44 ChangeLog.API
--- a/ChangeLog.API	Sat May 17 16:41:16 2008 +0000
+++ b/ChangeLog.API	Sat May 17 16:42:41 2008 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.x.x:
+version 2.4.2 (05/17/2008):
 	perl:
 		Added:
 		* Purple::Prefs::get_children_names.
diff -r 307bab4c9e63 -r 2a79e13aef44 NEWS
--- a/NEWS	Sat May 17 16:41:16 2008 +0000
+++ b/NEWS	Sat May 17 16:42:41 2008 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-2.4.2 (5/XX/2008):
+2.4.2 (5/17/2008):
 	Sadrul: We added some usability changes in this release, including the
 	typing notification, buddyicon and input area size in the conversation
 	windows, escape to close conversation windows etc. These changes should
diff -r 307bab4c9e63 -r 2a79e13aef44 pidgin.spec.in
--- a/pidgin.spec.in	Sat May 17 16:41:16 2008 +0000
+++ b/pidgin.spec.in	Sat May 17 16:42:41 2008 +0000
@@ -41,6 +41,7 @@
 %{!?_without_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h}
 %{!?_without_text:BuildRequires: ncurses-devel}
 %{!?_without_nm:BuildRequires: NetworkManager-devel}
+%{!?_without_gevolution:BuildRequires: evolution-data-server-devel}
 
 %if "%{_vendor}" == "suse"
 # For SuSE:
@@ -230,6 +231,7 @@
                                     %{?_without_gstreamer:--disable-gstreamer} \
                                     %{?_without_gtkspell:--disable-gtkspell} \
                                     %{?_without_nm:--disable-nm} \
+                                    %{!?_without_gevolution:--enable-gevolution} \
                                     %{?_with_mono:--enable-mono} \
                                     %{?_with_perlmakehack:--with-perl-lib=%{buildroot}%{_prefix}} \
                                     %{!?_with_perlmakehack:--with-perl-lib=%{_prefix}} \