rpms/openoffice.org/devel openoffice.org-1.9.114.ooo51638.mailmerge.patch, 1.1, 1.2

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.114.ooo51638.mailmerge.patch 
Log Message:
missing bit of patch

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.114.ooo51638.mailmerge.patch	6 Jul 2005 12:07:19 -0000	1.1
+++ openoffice.org-1.9.114.ooo51638.mailmerge.patch	6 Jul 2005 16:45:58 -0000	1.2
@@ -517,3 +517,20 @@
 +    Default = YES;
 +    Styles = ( );
 +End
+Index: util/makefile.mk
+===================================================================
+RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
+retrieving revision 1.32
+diff -u -p -r1.32 makefile.mk
+--- openoffice.org.orig/instsetoo_native/util/makefile.mk	20 Jun 2005 08:32:40 -0000	1.32
++++ openoffice.org/instsetoo_native/util/makefile.mk	6 Jul 2005 16:50:46 -0000
+@@ -90,7 +90,8 @@ LOCALPYFILES= \
+ 	$(BIN)$/uno.py \
+ 	$(BIN)$/unohelper.py \
+ 	$(BIN)$/pythonloader.py \
+-	$(BIN)$/pythonscript.py
++	$(BIN)$/pythonscript.py \
++	$(BIN)$/mailmerge.py
+ 
+ # PKGFORMAT taken from environment. See possible
+ # values below.