From 8b158243ea04ac11dee1d227ddb83ebf1b9dc2a2 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: May 28 2010 17:23:32 +0000
Subject: 2.31.2


---

diff --git a/.cvsignore b/.cvsignore
index 24ee3c7..1b46f25 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-empathy-2.31.1.tar.bz2
+empathy-2.31.2.tar.bz2
diff --git a/empathy.spec b/empathy.spec
index ddc3299..772b3b6 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -11,7 +11,7 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.31.1
+Version:	2.31.2
 Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
@@ -19,12 +19,9 @@ Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/Empathy
 
-Source0:	http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=592853
-Patch1:		presence-icons.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -87,7 +84,6 @@ It is built on top of the Telepathy framework.
 
 %prep
 %setup -q
-%patch1 -p1 -b .presence-icons
 # force these to be regenerated
 rm data/empathy.desktop
 rm data/empathy.schemas
@@ -161,6 +157,10 @@ fi
 %{_mandir}/man1/empathy*.1.gz
 
 %changelog
+* Fri May 28 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.2-1
+- Update to 2.31.2
+- drop presence-icon patch, handled upstream (partially)
+
 * Mon May 10 2010 Brian Pepple <bpepple@fedoraproject.org> - 2.31.1-1
 - Update to 2.31.1.
 - Bump min versions of gtk2 & tp-glib needed.
diff --git a/sources b/sources
index 39c9faa..6004c80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59a3a02e4c9894887ca1b68963a872fa  empathy-2.31.1.tar.bz2
+13db1d4d9c4bee2bbf0defd96e1f9881  empathy-2.31.2.tar.bz2