[empathy] - Update to 2.91.0. - Drop obsolete/provides on tp-haze-mission-control. - Drop keyname-fixes patch.

[Brian Pepple]

commit c2a955e1b3da18dd1c10509339299a06a537105a
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Mon Oct 4 13:37:42 2010 -0400

    - Update to 2.91.0.
    - Drop obsolete/provides on tp-haze-mission-control.
    - Drop keyname-fixes patch. Fixed upstream.
    - Drop empathy chat GDKKEY patch. Fixed upstream.
    - Drop avatar image gdkdisplay patch. Fixed upstream.
    - Drop depreciated gtk-dialog-separator patch. Fixed upstream.

 .gitignore                                         |    1 +
 Dont-use-deprecated-gtkdialogsethasseparator.patch |  208 --------------------
 ...y-avatar-image-dont-use-gdkdisplay-global.patch |   32 ---
 empathy-chat-update-GDK-defines-to-GDKKEY.patch    |   75 -------
 empathy.spec                                       |   34 ++--
 sources                                            |    2 +-
 6 files changed, 17 insertions(+), 335 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 97d6da5..64bc104 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ empathy-2.31.5.1.tar.bz2
 /empathy-2.31.91.1.tar.bz2
 /empathy-2.31.92.tar.bz2
 /empathy-2.32.0.tar.bz2
+/empathy-2.91.0.tar.bz2
diff --git a/empathy.spec b/empathy.spec
index 9dae911..5678c21 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -1,17 +1,18 @@
 ## Minimum required versions.
-%global	gtk2_min_version	2.21.2
+%global	gtk3_min_version	2.91.0
 %global	glib2_min_version	2.25.9
 %global	tp_mc_min_version	5.0.0
 %global	tp_glib_min_version	0.11.15
 %global	enchant_version		1.2.0
 %global network_manager_version 0.7.0
 %global libcanberra_version     0.4
-%global webkit_version          1.1.15
+%global webkit_version          1.3.2
 %global libnotify_version       0.4.4
 %global libchamplain_version    0.4
+%global folks_version           0.1.5
 
 Name:		empathy
-Version:	2.32.0
+Version:	2.91.0
 Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
@@ -19,7 +20,7 @@ Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/Empathy
 
-Source0:	http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -32,7 +33,7 @@ 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:	gtk3-devel >= %{gtk3_min_version}
 BuildRequires:	intltool
 BuildRequires:	libxml2-devel
 BuildRequires:	scrollkeeper
@@ -47,7 +48,7 @@ BuildRequires:  geoclue-devel >= 0.11
 BuildRequires:	unique3-devel
 BuildRequires:	nautilus-sendto-devel
 BuildRequires:  telepathy-logger-devel >= 0.1.5
-BuildRequires:	folks-devel >= 0.1.15
+BuildRequires:	folks-devel >= %{folks_version}
 
 Requires:	telepathy-filesystem
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
@@ -58,10 +59,6 @@ Requires:	telepathy-idle
 Requires:	telepathy-butterfly
 Requires:	telepathy-haze
 
-## Profiles are no longer used, so we can drop this around F14.
-Obsoletes:	telepathy-haze-mission-control < 0.2.0-3
-Provides:	telepathy-haze-mission-control = 0.2.0-3
-
 ## Devel, libs, and python subpackages have been removed.  These can be dropped around F15.
 Obsoletes:	%{name}-devel < 2.29.2-1
 Provides:	%{name}-devel = %{version}-%{release}
@@ -70,10 +67,6 @@ Provides:	%{name}-libs = %{version}-%{release}
 Obsoletes:	%{name}-python < 2.29.2-1
 Provides:	%{name}-python = %{version}-%{release}
 
-Patch0: empathy-avatar-image-dont-use-gdkdisplay-global.patch
-Patch1: Dont-use-deprecated-gtkdialogsethasseparator.patch
-Patch2: empathy-chat-update-GDK-defines-to-GDKKEY.patch
-Patch3: more-keyname-fixes.patch
 
 %description
 Empathy is powerful multi-protocol instant messaging client which
@@ -83,11 +76,6 @@ It is built on top of the Telepathy framework.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gdkdisplay
-%patch1 -p1 -b .separator
-%patch2 -p1 -b .gdkkey
-%patch3 -p1 -b .more-gdkkey
-
 # force this to be regenerated
 rm data/empathy.desktop
 
@@ -164,6 +152,14 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Mon Oct  4 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.91.0-1
+- Update to 2.91.0.
+- Drop obsolete/provides on tp-haze-mission-control.
+- Drop keyname-fixes patch. Fixed upstream.
+- Drop empathy chat GDKKEY patch. Fixed upstream.
+- Drop avatar image gdkdisplay patch. Fixed upstream.
+- Drop depreciated gtk-dialog-separator patch. Fixed upstream.
+
 * Mon Sep 27 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.32.0-1
 - Update to 2.32.0.
 
diff --git a/sources b/sources
index d5494ca..493dfd0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-491ad04843938951afa5e34a3e238aca  empathy-2.32.0.tar.bz2
+81b5fc69a996e1eb5634b21074396b96  empathy-2.91.0.tar.bz2