diff --git a/pidgin-2.10.11-purple-remote-python3.patch b/pidgin-2.10.11-purple-remote-python3.patch new file mode 100644 index 0000000..ca0b00c --- /dev/null +++ b/pidgin-2.10.11-purple-remote-python3.patch @@ -0,0 +1,48 @@ +Actually make things work in python3. + +Author: Jan Synacek + +--- 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 + import xml.dom.minidom + + sys.stdin = codecs.getwriter('utf-8')(sys.stdin); +-sys.stdout = codecs.getwriter('utf-8')(sys.stdout); ++sys.stdout = codecs.getwriter('utf-8')(sys.stdout.detach()); + + xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName + +@@ -41,7 +41,7 @@ class CheckedAttribute: + return result + + def show_help(requested=False): +- print """This program uses D-Bus to communicate with purple. ++ print("""This program uses D-Bus to communicate with purple. + + Usage: + +@@ -72,7 +72,7 @@ Examples of commands: + + PurpleAccountsFindConnected?name=&protocol=prpl-jabber + PurpleAccountsFindConnected(,prpl-jabber) +-""" % sys.argv[0] ++""" % sys.argv[0]) + if (requested): + sys.exit(0) + else: +@@ -233,12 +233,12 @@ if len(sys.argv) == 1: + elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"): + show_help(True) + elif (obj == None): +- print "No existing libpurple instance detected." ++ print("No existing libpurple instance detected.") + sys.exit(1); + + for arg in sys.argv[1:]: + output = execute(arg) + + if (output != None): +- print output ++ print(output) + diff --git a/pidgin.spec b/pidgin.spec index 0f42fd0..3a4b089 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -131,7 +131,7 @@ Name: pidgin Version: 2.10.11 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls # GPLv2 - silc & novell prpls @@ -167,6 +167,7 @@ Source1: purple-fedora-prefs.xml ## Patches 0-99: Fedora specific or upstream wont accept Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch Patch1: pidgin-2.10.9-valgrind.patch +Patch2: pidgin-2.10.11-purple-remote-python3.patch ## Patches 100+: To be Included in Future Upstream Patch100: pidgin-2.10.1-fix-msn-ft-crashes.patch @@ -509,6 +510,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}" %patch0 -p1 -b .aplay %endif %patch1 -p1 +%patch2 -p1 ## Patches 100+: To be Included in Future Upstream @@ -840,6 +842,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 1 2015 Jan Synáček - 2.10.11-11 +- Fix purple-remote when running in python3 (#1226468) + * Tue Mar 17 2015 David Woodhouse - 2.10.11-10 - Import all Lync-collab patches now that they are upstream.