From b102f80eb2e89addd2013be6a5e57a1abc99c83e Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Jun 03 2015 08:07:51 +0000
Subject: Refix purple-remote when running in python3 (#1226468)


---

diff --git a/pidgin-2.10.11-purple-remote-python3.patch b/pidgin-2.10.11-purple-remote-python3.patch
index ca0b00c..e48a590 100644
--- a/pidgin-2.10.11-purple-remote-python3.patch
+++ b/pidgin-2.10.11-purple-remote-python3.patch
@@ -2,9 +2,16 @@ Actually make things work in python3.
 
 Author: Jan Synacek <jsynacek@redhat.com>
 
---- a/libpurple/purple-remote	2015-03-17 17:03:51.000000000 +0100
-+++ b/libpurple/purple-remote	2015-06-01 13:39:14.224351140 +0200
-@@ -9,7 +9,7 @@ import sys
+--- a/libpurple/purple-remote	2015-06-03 09:52:26.324668688 +0200
++++ b/libpurple/purple-remote	2015-06-03 09:55:41.287253981 +0200
+@@ -3,13 +3,13 @@
+ import codecs
+ import dbus
+ import re
+-import urllib
++import urllib.parse
+ import sys
+ 
  import xml.dom.minidom 
  
  sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
@@ -31,6 +38,15 @@ Author: Jan Synacek <jsynacek@redhat.com>
      if (requested):
          sys.exit(0)
      else:
+@@ -120,7 +120,7 @@ def execute(uri):
+     if paramstring is not None:
+         for param in paramstring.split("&"):
+             key, value = extendlist(param.split("=",1), 2, "")
+-            params[key] = urllib.unquote(value)
++            params[key] = urllib.parse.unquote(value)
+ 
+     accountname = params.get("account", "")
+ 
 @@ -233,12 +233,12 @@ if len(sys.argv) == 1:
  elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"):
      show_help(True)
diff --git a/pidgin.spec b/pidgin.spec
index 3a4b089..149e08f 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -131,7 +131,7 @@
 
 Name:           pidgin
 Version:        2.10.11
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -842,6 +842,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jun  3 2015 Jan Synáček <jsynacek@redhat.com> - 2.10.11-12
+- Refix purple-remote when running in python3 (#1226468)
+
 * Mon Jun  1 2015 Jan Synáček <jsynacek@redhat.com> - 2.10.11-11
 - Fix purple-remote when running in python3 (#1226468)