[empathy] Update to 3.11.3. Drop empathy_ensure_individual_from_tp_contact() patch. Fixed upstream.

Brian Pepple bpepple at fedoraproject.org
Thu Dec 19 14:52:05 UTC 2013


commit 611a04870723b478e321cf56ae904981e4effe5c
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Thu Dec 19 09:50:35 2013 -0500

    Update to 3.11.3.
    Drop empathy_ensure_individual_from_tp_contact() patch. Fixed upstream.

 .gitignore                                         |    1 +
 ...empathy_create_individual_from_tp_contact.patch |  102 --------------------
 empathy.spec                                       |   11 +-
 sources                                            |    2 +-
 4 files changed, 8 insertions(+), 108 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 625d533..60e0f0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,4 @@ empathy-3.3.5.tar.xz
 /empathy-3.10.0.tar.xz
 /empathy-3.10.1.tar.xz
 /empathy-3.11.1.tar.xz
+/empathy-3.11.3.tar.xz
diff --git a/empathy.spec b/empathy.spec
index e065a01..b68de6d 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -16,8 +16,8 @@
 %global gcr_version		2.91.4
 
 Name:		empathy
-Version:	3.11.1
-Release:	2%{?dist}
+Version:	3.11.3
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 License:	GPLv2+
@@ -25,8 +25,6 @@ URL:		http://live.gnome.org/Empathy
 
 Source0:	http://download.gnome.org/sources/%{name}/3.11/%{name}-%{version}.tar.xz
 Source1:	%{name}-README.ConnectionManagers
-## Gnome Bug #712839
-Patch0:         001-Remove_empathy_create_individual_from_tp_contact.patch
 
 BuildRequires:	enchant-devel >= %{enchant_version}
 BuildRequires:	iso-codes-devel
@@ -85,7 +83,6 @@ It is built on top of the Telepathy framework.
 
 %prep
 %setup -q
-%patch0 -p1
 # force this to be regenerated
 rm data/empathy.desktop
 
@@ -201,6 +198,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
 
 %changelog
+* Thu Dec 19 2013 Brian Pepple <bpepple at fedoraproject.org> - 3.11.3-1
+- Update to 3.11.3.
+- Drop empathy_ensure_individual_from_tp_contact() patch. Fixed upstream.
+
 * Mon Nov 25 2013 Brian Pepple <bpepple at fedoraproject.org> - 3.11.1-2
 - Pull upstream patch to use empathy_ensure_individual_from_tp_contact().
 
diff --git a/sources b/sources
index 3285ce3..53b9d16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3046e63e63ebe3053a198120df5054d8  empathy-3.11.1.tar.xz
+2743665271c8ea292e1210372854a67b  empathy-3.11.3.tar.xz


More information about the scm-commits mailing list