diff --git a/pidgin-2.0.1-purple-remote-oscar.patch b/pidgin-2.0.1-purple-remote-oscar.patch new file mode 100644 index 0000000..51dec83 --- /dev/null +++ b/pidgin-2.0.1-purple-remote-oscar.patch @@ -0,0 +1,39 @@ +----------------------------------------------------------------- +Revision: a0ccd8708935303973ab94ba534dabdc72002039 +Ancestor: b9db139bf548b0ec1e2265131772e2eb763cfa5a +Author: markdoliner@pidgin.im +Date: 2007-06-04T05:56:16 +Branch: im.pidgin.pidgin + +Modified files: + libpurple/purple-remote + +ChangeLog: + +Fix http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240589 + +"If you run "gaim-remote aim:goim?screenname=whatever" then it throws an +exception because it looks for a "prpl-oscar" account, but apparently I am +signed in with a "prpl-aim" account." + +============================================================ +--- libpurple/purple-remote 3d893ee565001dfffefae1f2d2c28d167530a14a ++++ libpurple/purple-remote da0715a989b96d9f4840c7ab2917bccb76112413 +@@ -31,7 +31,7 @@ def show_help(): + return result + + def show_help(): +- print """This program uses DBus to communicate with purple. ++ print """This program uses D-Bus to communicate with purple. + + Usage: + +@@ -96,8 +96,6 @@ def execute(uri): + protocol = match.group(2) + if protocol == "xmpp": + protocol = "jabber" +- if protocol == "aim" or protocol == "icq": +- protocol = "oscar" + if protocol is not None: + protocol = "prpl-" + protocol + command = match.group(5) diff --git a/pidgin.spec b/pidgin.spec index 9267bd6..3ffc86d 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -27,7 +27,7 @@ Name: pidgin Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet URL: http://pidgin.im/ @@ -55,6 +55,7 @@ Source1: purple-fedora-prefs.xml ## Patches 100+: To be Included in Future Upstream Patch100: pidgin-2.0.1-early-g_thread_init.patch Patch101: pidgin-2.0.1-purple-remote-syntax.patch +Patch102: pidgin-2.0.1-purple-remote-oscar.patch Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -268,6 +269,7 @@ and plugins. ## Patches 100+: To be Included in Future Upstream %patch100 -p0 %patch101 -p0 +%patch102 -p0 %patch113 -p1 # Relabel internal version for support purposes @@ -479,6 +481,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 4 2007 Stu Tomlinson - 2.0.1-3 +- Fix purple-remote for AIM & ICQ accounts (#240589) + * Fri May 31 2007 Stu Tomlinson - 2.0.1-2 - Call g_thread_init early (#241883) - Fix purple-remote syntax error (#241905)