rpms/telepathy-haze/devel telepathy-haze-no-yahoo-japan.patch, NONE, 1.1 telepathy-haze.spec, 1.17, 1.18

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/telepathy-haze/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19965

Modified Files:
	telepathy-haze.spec 
Added Files:
	telepathy-haze-no-yahoo-japan.patch 
Log Message:
Add upstream patch to fix Yahoo! protocol usage (GNOME bug #591381, Fedora bug #514998).

telepathy-haze-no-yahoo-japan.patch:
 haze.manager |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE telepathy-haze-no-yahoo-japan.patch ---
>From d6c1f853371f4b4a0b2c8554512d148f37d6d990 Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson at collabora.co.uk>
Date: Thu, 13 Aug 2009 00:44:15 +0100
Subject: [PATCH] Remove Yahoo Japan options from haze.manager

These have been removed in libpurple 2.6.0, but MC4 explicitly sets
them, and hence RequestConnection fails. Fixes Gnome bug #591381.
---
 data/haze.manager |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/data/haze.manager b/data/haze.manager
index 636c133..d87c918 100644
--- a/data/haze.manager
+++ b/data/haze.manager
@@ -157,22 +157,16 @@ default-useproxy=false
 [Protocol yahoo]
 param-account=s required
 param-password=s required
-param-yahoojp=b
 param-server=s
-param-serverjp=s
 param-port=i
 param-xfer-host=s
-param-xferjp-host=s
 param-xfer-port=i
 param-room-list-locale=s
 param-ignore-invites=b
 param-charset=s
-default-yahoojp=false
 default-server=scs.msg.yahoo.com
-default-serverjp=cs.yahoo.co.jp
 default-port=5050
 default-xfer-host=filetransfer.msg.yahoo.com
-default-xferjp-host=filetransfer.msg.yahoo.co.jp
 default-xfer-port=80
 default-room-list-locale=us
 default-ignore-invites=false
-- 
1.6.3.3



Index: telepathy-haze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/telepathy-haze.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- telepathy-haze.spec	27 Jul 2009 05:44:20 -0000	1.17
+++ telepathy-haze.spec	14 Aug 2009 04:43:51 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		telepathy-haze
 Version:	0.3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A multi-protocol Libpurple connection manager for Telepathy
 
 Group:		Applications/Communications
@@ -9,6 +9,10 @@ URL:		http://developer.pidgin.im/wiki/Te
 
 Source0:	http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 
+## Remove Yahoo Japan options from haze.manager, to fix Yahoo! IM connectivity
+## issues. (Fedora bug #514998, GNOME Bug #591381)
+Patch0: 	%{name}-no-yahoo-japan.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel >= 2.1.1
@@ -26,6 +30,7 @@ others will probably work too.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-yahoo-japan
 
 
 %build
@@ -51,6 +56,13 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telepathy-haze.8*
 
 %changelog
+* Thu Aug 13 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.1-3
+- Add upstream patch to remove the Yahoo! Japan from the manager profile,
+  which fixes Yahoo! IM connectivity issues as reported in GNOME bug #591381.
+  + no-yahoo-japan.patch
+- Resolves: Fedora bug #514998 (Yahoo! Instant Messenger accounts do not work
+  in empathy).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild