rpms/openoffice.org/devel openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch, NONE, 1.1 openoffice.org.spec, 1.269, 1.270

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch 
Log Message:
give my email mailmerge component a go

openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch:
 bin/modules/installer/servicesfile.pm        |    0 
 solenv/bin/modules/installer/servicesfile.pm |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch ---
Index: bin/modules/installer/servicesfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/servicesfile.pm,v
retrieving revision 1.20
diff -u -r1.20 servicesfile.pm
--- openoffice.org.orig/solenv/bin/modules/installer/servicesfile.pm       17 Jun 2005 09:49:10 -0000 1.20
+++ openoffice.org/solenv/bin/modules/installer/servicesfile.pm       6 Jul 2005 11:54:02 -0000
@@ -400,7 +400,7 @@
                                $counter++;
                        }

-                       if ((( $counter > 0 ) && ( $counter%$installer::globals::unomaxservices == 0 )) || (( $counter > 0 ) && ( $i == $#{$pythoncomponents} )))       # limiting to $installer::globals::maxservices files
+                       if ( $counter > 0 )
                        {
                                $filestring =~ s/\;\s*$//;
                                $filestring = substr( $filestring, 0, length($filestring)-3);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- openoffice.org.spec	5 Jul 2005 08:40:07 -0000	1.269
+++ openoffice.org.spec	6 Jul 2005 12:01:26 -0000	1.270
@@ -111,6 +111,8 @@
 Patch48: openoffice.org-1.9.114.oooXXXXX.rpath.patch
 Patch49: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
 Patch50: openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch
+Patch51: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
+Patch52: openoffice.org-1.9.114.ooo51638.mailmerge.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -184,6 +186,7 @@
 Group: Applications/Productivity
 Obsoletes: openoffice.org
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
 Requires: libwpd >= 0.8.0
 
 %description writer
@@ -739,6 +742,8 @@
 %patch47 -p1 -b .ooo51385.bridges.stack.patch
 %patch48 -p1 -b .oooXXXXX.rpath.patch
 %patch50 -p1 -b .ooo50745.cruxcrash.vcl.patch
+%patch51 -p1 -b .ooo51637.solenv.pyuno.patch
+%patch52 -p1 -b .ooo51638.mailmerge.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped
@@ -2878,6 +2883,7 @@
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/libpyuno.so
+%{instdir}/program/mailmerge.py*
 %{instdir}/program/pythonloader.py*
 %{instdir}/program/pythonloader.uno.so
 %{instdir}/program/pythonloader.unorc
@@ -2904,6 +2910,10 @@
     + openoffice.org-1.9.114.oooXXXXX.rpath.patch
     + openoffice.org-1.9.114.rh161886.rpath.desktop.patch
 - add openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch for rh#160293#
+- add openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch to workaround
+  multiple pyuno registering failures
+- add openoffice.org-1.9.114.ooo51638.mailmerge.patch to provide email
+  support for maill merge
 
 * Mon Jul 04 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.114-1
 - bump to next version