rpms/openoffice.org/devel openoffice.org-2.0.3.ooo65230.x86_64.automation.patch, NONE, 1.1 openoffice.org-2.0.3.oooXXXXX.exceptions.sd.patch, NONE, 1.1 openoffice.org.spec, 1.692, 1.693

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo65230.x86_64.automation.patch 
	openoffice.org-2.0.3.oooXXXXX.exceptions.sd.patch 
Log Message:
more needed

openoffice.org-2.0.3.ooo65230.x86_64.automation.patch:
 automation/source/testtool/objtest.cxx |    2 ++
 source/testtool/objtest.cxx            |    0 
 2 files changed, 2 insertions(+)

--- NEW FILE openoffice.org-2.0.3.ooo65230.x86_64.automation.patch ---
Index: source/testtool/objtest.cxx
===================================================================
RCS file: /cvs/util/automation/source/testtool/objtest.cxx,v
retrieving revision 1.23
diff -u -r1.23 objtest.cxx
--- openoffice.org.orig/automation/source/testtool/objtest.cxx	5 May 2006 08:10:46 -0000	1.23
+++ openoffice.org/automation/source/testtool/objtest.cxx	10 May 2006 09:30:38 -0000
@@ -530,6 +530,8 @@
     abGP.Append( "13" );
 #elif defined NETBSD
     abGP.Append( "14" );
+#elif defined LINUX && defined X86_64
+    abGP.Append( "15" );  // Linux x86-64
 #else
 #error ("unknown platform. please request an ID for your platform on qa/dev")
 #endif

openoffice.org-2.0.3.oooXXXXX.exceptions.sd.patch:
 sd/source/ui/view/makefile.mk |    1 +
 source/ui/view/makefile.mk    |    0 
 2 files changed, 1 insertion(+)

--- NEW FILE openoffice.org-2.0.3.oooXXXXX.exceptions.sd.patch ---
Index: source/ui/view/makefile.mk
===================================================================
RCS file: /cvs/graphics/sd/source/ui/view/makefile.mk,v
retrieving revision 1.27
diff -u -r1.27 makefile.mk
--- openoffice.org.orig/sd/source/ui/view/makefile.mk	28 Apr 2006 15:00:26 -0000	1.27
+++ openoffice.org/sd/source/ui/view/makefile.mk	10 May 2006 09:28:28 -0000
@@ -70,6 +70,7 @@
 		$(SLO)$/UpdateLockManager.obj	\
 		$(SLO)$/ViewShellBase.obj		\
 		$(SLO)$/ViewShellImplementation.obj	\
+		$(SLO)$/FormShellManager.obj			\
 		$(SLO)$/ViewShellManager.obj
 
 EXCEPTIONSNOOPTFILES=\


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -r1.692 -r1.693
--- openoffice.org.spec	9 May 2006 13:43:14 -0000	1.692
+++ openoffice.org.spec	10 May 2006 09:33:03 -0000	1.693
@@ -219,6 +219,8 @@
 Patch30: openoffice.org-2.0.3.ooo64908.sot.extraqual.patch
 Patch31: openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
 Patch32: openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
+Patch33: openoffice.org-2.0.3.oooXXXXX.exceptions.sd.patch
+Patch34: openoffice.org-2.0.3.ooo65230.x86_64.automation.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1133,6 +1135,8 @@
 %patch30 -p1 -b .ooo64908.sot.extraqual.patch
 %patch31 -p1 -b .gccXXXXX.svtools.R_X86_64_PC32.patch
 %patch32 -p1 -b .ooo65052.bridges.makeasmpic.patch
+%patch33 -p1 -b .oooXXXXX.exceptions.sd.patch
+%patch34 -p1 -b .ooo65230.x86_64.automation.patch
 
 %if %{includingexternals}
 #start ludicrous workaround