rpms/openoffice.org/devel workspace.pythonssldedux.patch, NONE, 1.1 openoffice.org.spec, 1.2091, 1.2092

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15416

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.pythonssldedux.patch 
Log Message:
get cram-md5 authentication working in emailmerge

workspace.pythonssldedux.patch:
 mailmerge.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE workspace.pythonssldedux.patch ---
diff -r ccdb8c85656c scripting/source/pyprov/mailmerge.py
--- a/scripting/source/pyprov/mailmerge.py	Wed Oct 28 09:17:36 2009 +0000
+++ b/scripting/source/pyprov/mailmerge.py	Tue Dec 01 13:21:47 2009 +0000
@@ -85,8 +85,8 @@
 			self.server.starttls()
 			self.server.ehlo()
 
-		user = xAuthenticator.getUserName()
-		password = xAuthenticator.getPassword()
+		user = xAuthenticator.getUserName().encode('ascii')
+		password = xAuthenticator.getPassword().encode('ascii')
 		if user != '':
 			if dbg:
 				print >> sys.stderr, 'Logging in, username of', user
@@ -234,8 +234,8 @@
 			self.server = imaplib.IMAP4(server, port)
 		print >> sys.stderr, "AFTER"
 			
-		user = xAuthenticator.getUserName()
-		password = xAuthenticator.getPassword()
+		user = xAuthenticator.getUserName().encode('ascii')
+		password = xAuthenticator.getPassword().encode('ascii')
 		if user != '':
 			if dbg:
 				print >> sys.stderr, 'Logging in, username of', user
@@ -302,8 +302,8 @@
 			self.server = poplib.POP3(server, port)
 		print >> sys.stderr, "AFTER"
 			
-		user = xAuthenticator.getUserName()
-		password = xAuthenticator.getPassword()
+		user = xAuthenticator.getUserName().encode('ascii')
+		password = xAuthenticator.getPassword().encode('ascii')
 		if dbg:
 			print >> sys.stderr, 'Logging in, username of', user
 		self.server.user(user)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2091
retrieving revision 1.2092
diff -u -p -r1.2091 -r1.2092
--- openoffice.org.spec	27 Nov 2009 13:10:04 -0000	1.2091
+++ openoffice.org.spec	1 Dec 2009 13:24:57 -0000	1.2092
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 6
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -131,6 +131,7 @@ Patch53: openoffice.org-3.2.0.ooo107137.
 Patch54: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
 Patch55: openoffice.org-3.3.0.ooo102645.fix.es.patch
 Patch56: workspace.vcl108.patch
+Patch57: workspace.pythonssldedux.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1656,6 +1657,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch54 -p1 -b .ooo107151.sc.pop-empty-cell.patch
 %patch55 -p0 -b .ooo102645.fix.es.patch
 %patch56 -p0 -b .workspace.vcl108.patch
+%patch57 -p1 -b .workspace.pythonssldedux.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4162,6 +4164,10 @@ fi
 %endif
 
 %changelog
+* Tue Dec 01 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-6.3
+- add workspace.pythonssldedux.patch to get CRAM-MD5 working from
+  emailmerge
+
 * Fri Nov 27 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-6.2
 - Resolves: rhbz#541222 add 
   openoffice.org-3.2.0.ooo107260.vcl.clipboard.shutdown.patch (caolanm)