[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.114.ooo51638.mailmerge.patch, 1.2, 1.3 openoffice.org.spec, 1.406, 1.407



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5677

Modified Files:
	openoffice.org-1.9.114.ooo51638.mailmerge.patch 
	openoffice.org.spec 
Log Message:
stick to utf-8 encoding for mailmerge wizard

openoffice.org-1.9.114.ooo51638.mailmerge.patch:
 instsetoo_native/util/makefile.mk                             |    3 
 openoffice.org/scp2/source/python/module_python_mailmerge.scp |   71 ++
 openoffice.org/scripting/source/pyprov/mailmerge.py           |  343 ++++++++++
 scp2/source/python/file_python.scp                            |   14 
 scp2/source/python/makefile.mk                                |    1 
 scp2/source/python/module_python.ulf                          |    5 
 scp2/util/makefile.mk                                         |    2 
 scripting/source/pyprov/makefile.mk                           |    3 
 source/pyprov/makefile.mk                                     |    0 
 source/python/file_python.scp                                 |    0 
 source/python/makefile.mk                                     |    0 
 source/python/module_python.ulf                               |    0 
 util/makefile.mk                                              |    0 
 13 files changed, 438 insertions(+), 4 deletions(-)

Index: openoffice.org-1.9.114.ooo51638.mailmerge.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.114.ooo51638.mailmerge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.114.ooo51638.mailmerge.patch	6 Jul 2005 16:45:58 -0000	1.2
+++ openoffice.org-1.9.114.ooo51638.mailmerge.patch	23 Aug 2005 13:54:32 -0000	1.3
@@ -154,7 +154,7 @@
 +		textmsg = Message()
 +		textmsg['Content-Type'] = flavor.MimeType
 +	        textmsg['MIME-Version'] = '1.0'
-+		textmsg.set_payload(textbody)
++		textmsg.set_payload(textbody.encode('utf-8'))
 +
 +		if (len(attachments)):
 +			msg = MIMEMultipart()


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- openoffice.org.spec	23 Aug 2005 11:20:24 -0000	1.406
+++ openoffice.org.spec	23 Aug 2005 13:54:32 -0000	1.407
@@ -867,7 +867,7 @@
 fi
 cd config_office
 autoconf
-%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --enable-symbols --enable-openldap --enable-libsn --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-mathmldtd --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang}
+%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-libsn --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]