[empathy/f14/master] * Wed Sep 01 2010 Bastien Nocera <bnocera at redhat.com> 2.31.90-1 - Update to 2.31.90 - Build against

[Bastien Nocera]

commit 2cd87aec495c54747618c93f9490e3d12daf0453
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Sep 1 11:25:33 2010 +0100

    * Wed Sep 01 2010 Bastien Nocera <bnocera at redhat.com> 2.31.90-1
    - Update to 2.31.90
    - Build against GTK+ 2.x

 empathy.spec |   17 +++++++++++------
 sources      |    2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/empathy.spec b/empathy.spec
index c72ed09..9f5846a 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -11,8 +11,8 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.31.5.1
-Release:	2%{?dist}
+Version:	2.31.90
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,8 +33,8 @@ BuildRequires:	gettext
 BuildRequires:	glib2-devel >= %{glib2_min_version}
 BuildRequires:	gnome-doc-utils >= 0.17.3
 BuildRequires:	libcanberra-devel >= %{libcanberra_version}
-BuildRequires:	webkitgtk3-devel >= %{webkit_version}
-BuildRequires:	gtk3-devel >= %{gtk2_min_version}
+BuildRequires:	webkitgtk-devel >= %{webkit_version}
+BuildRequires:	gtk2-devel >= %{gtk2_min_version}
 BuildRequires:	intltool
 BuildRequires:	libxml2-devel
 BuildRequires:	scrollkeeper
@@ -46,9 +46,10 @@ BuildRequires:	gnome-keyring-devel
 #BuildRequires:  libchamplain-gtk-devel >= %{libchamplain_version}
 BuildRequires:  clutter-gtk-devel
 BuildRequires:  geoclue-devel >= 0.11
-BuildRequires:	unique3-devel
+BuildRequires:	unique-devel
 BuildRequires:	nautilus-sendto-devel
 BuildRequires:  telepathy-logger-devel >= 0.1.2
+BuildRequires:	folks-devel >= 0.1.13
 
 Requires:	telepathy-filesystem
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
@@ -89,7 +90,7 @@ rm data/empathy.desktop
 %build
 ## GCC complains about some unused functions, so we forcibly show those as
 ## simple warnings instead of build-halting errors.
-%configure --disable-static
+%configure --disable-static --enable-gtk3=no
 ## RPATHs are yucky.
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -163,6 +164,10 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Wed Sep 01 2010 Bastien Nocera <bnocera at redhat.com> 2.31.90-1
+- Update to 2.31.90
+- Build against GTK+ 2.x
+
 * Fri Jul 16 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.31.5.1-2
 - Rebuild for new eds.
 
diff --git a/sources b/sources
index f4d9307..9477c83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bdfb741c1153028ab0554a306cd68b33  empathy-2.31.5.1.tar.bz2
+7a7795b8f56b0c8e6e95d17994954535  empathy-2.31.90.tar.bz2