From b1c61312ae57e3a1e359444bb07a9590bdc3ad68e8c03590672d440b3dea69b7 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 1 Apr 2010 01:31:23 +0000 Subject: [PATCH] Accepting request 36229 from GNOME:Apps Copy from GNOME:Apps/pidgin based on submit request 36229 from user vuntz OBS-URL: https://build.opensuse.org/request/show/36229 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=52 --- pidgin-oscar-clientlogin.patch | 13 +++++++++++++ pidgin.changes | 7 +++++++ pidgin.spec | 5 ++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pidgin-oscar-clientlogin.patch diff --git a/pidgin-oscar-clientlogin.patch b/pidgin-oscar-clientlogin.patch new file mode 100644 index 0000000..abc3e6a --- /dev/null +++ b/pidgin-oscar-clientlogin.patch @@ -0,0 +1,13 @@ +Index: pidgin-2.6.6/libpurple/protocols/oscar/clientlogin.c +=================================================================== +--- pidgin-2.6.6.orig/libpurple/protocols/oscar/clientlogin.c ++++ pidgin-2.6.6/libpurple/protocols/oscar/clientlogin.c +@@ -43,7 +43,7 @@ + #include "core.h" + + #define URL_CLIENT_LOGIN "https://api.screenname.aol.com/auth/clientLogin" +-#define URL_START_OSCAR_SESSION "http://api.oscar.aol.com/aim/startOSCARSession" ++#define URL_START_OSCAR_SESSION "https://api.oscar.aol.com/aim/startOSCARSession" + + /* + * Using clientLogin requires a developer ID. This key is for libpurple. diff --git a/pidgin.changes b/pidgin.changes index d233f5f..97bfe48 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 30 21:41:02 UTC 2010 - dimstar@opensuse.org + +- Add pidgin-oscar-clientlogin.patch to fix connection issues + to OSCAR networks (ICQ). Patch from upstream commit + 0e3079d15adeb12c1e57ceaf5bf037f9b71c8abd. + ------------------------------------------------------------------- Tue Mar 2 11:23:06 UTC 2010 - dimstar@opensuse.org diff --git a/pidgin.spec b/pidgin.spec index a3f9c38..e4af335 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -21,7 +21,7 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client Version: 2.6.6 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Networking/Instant Messenger Url: http://www.pidgin.im/ @@ -43,6 +43,8 @@ Patch13: pidgin-browser-default.patch Patch15: pidgin-bnc550170-qq-2008only.patch # PATCH-FIX-UPSTREAM pidgin-oscar-portability.patch dimstar@opensuse.org -- Fix portability issue to x86_64 Patch16: pidgin-oscar-portability.patch +# PATCH-FIX-UPSTREAM pidgin-oscar-clientlogin.patch deb#571413 -- Fix connections to Oscar network. +Patch17: pidgin-oscar-clientlogin.patch # Can use external libzephyr BuildRequires: cyrus-sasl-devel BuildRequires: dbus-1-devel @@ -319,6 +321,7 @@ translation-update-upstream %patch13 %patch15 -p0 %patch16 -p1 +%patch17 -p1 # Change Myanmar/Myanmar to Myanmar: rename my_MM my po/my_MM.* %{__sed} -i "/^ALL_LINGUAS/s/ my_MM / my /" configure.ac