rpms/telepathy-haze/F-11 telepathy-haze-no-yahoo-japan.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 telepathy-haze.spec, 1.15, 1.16

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/telepathy-haze/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30452

Modified Files:
	.cvsignore sources telepathy-haze.spec 
Added Files:
	telepathy-haze-no-yahoo-japan.patch 
Log Message:
Update to 0.3.1, and 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Apr 2009 05:29:40 -0000	1.7
+++ .cvsignore	14 Aug 2009 05:27:28 -0000	1.8
@@ -1 +1 @@
-telepathy-haze-0.3.0.tar.gz
+telepathy-haze-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Apr 2009 05:29:40 -0000	1.7
+++ sources	14 Aug 2009 05:27:28 -0000	1.8
@@ -1 +1 @@
-3d5528baa98f5e8151d2b740ff69cc85  telepathy-haze-0.3.0.tar.gz
+0076c47edea2cf2c9708fd7aaaf848a8  telepathy-haze-0.3.1.tar.gz


Index: telepathy-haze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-11/telepathy-haze.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- telepathy-haze.spec	13 Apr 2009 05:29:40 -0000	1.15
+++ telepathy-haze.spec	14 Aug 2009 05:27:28 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		telepathy-haze
-Version:	0.3.0
+Version:	0.3.1
 Release:	1%{?dist}
 Summary:	A multi-protocol Libpurple connection manager for Telepathy
 
@@ -9,9 +9,13 @@ 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
+BuildRequires:	libpurple-devel >= 2.1.1
 BuildRequires:	telepathy-glib-devel >= 0.7.21
   
 Requires:	telepathy-filesystem    
@@ -26,6 +30,7 @@ others will probably work too.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-yahoo-japan
 
 
 %build
@@ -51,6 +56,14 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telepathy-haze.8*
 
 %changelog
+* Thu Aug 13 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.1-1
+- Update to new upstream release (0.3.1).
+- 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 Apr 12 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.0-1
 - Update to new upstream release (0.3.0)