rpms/openoffice.org/devel openoffice.org.spec, 1.1494, 1.1495 pseudoworkspace.valgrind1.patch, 1.32, 1.33 openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch, 1.1, NONE workspace.cmcfixes43.patch, 1.4, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31705

Modified Files:
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
Removed Files:
	openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch 
	workspace.cmcfixes43.patch 
Log Message:
next version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1494
retrieving revision 1.1495
diff -u -r1.1494 -r1.1495
--- openoffice.org.spec	3 May 2008 13:04:02 -0000	1.1494
+++ openoffice.org.spec	4 May 2008 11:33:06 -0000	1.1495
@@ -125,21 +125,19 @@
 Patch52: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
 Patch53: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
 Patch54: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch55: workspace.cmcfixes43.patch
-Patch56: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch57: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch58: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch59: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch60: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch61: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
-Patch62: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
-Patch63: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-Patch64: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch65: openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
-Patch66: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch67: openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
-Patch68: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch69: workspace.ucpgio1.patch
+Patch55: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch56: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch57: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch58: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch59: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch60: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+Patch61: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+Patch62: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+Patch63: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch64: openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
+Patch65: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch66: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch67: workspace.ucpgio1.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1234,21 +1232,19 @@
 %patch52 -p1 -b .ooo85921.sd.editmasterundermouse.patch
 %patch53 -p1 -b .ooo86080.unopkg.bodge.patch
 %patch54 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch55 -p1 -b .workspace.cmcfixes43.patch
-%patch56 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch57 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch58 -p1 -b .ooo87204.toolkit.64bitevent.patch
-%patch59 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch60 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch61 -p1 -b .ooo85691.vcl.tooltipcolor.patch
-%patch62 -p1 -b .ooo87991.fpickersafe.patch
-%patch63 -p1 -b .ooo88260.decl-defi-mismatch.patch
-%patch64 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch65 -p1 -b .oo88319.setup_native.missing.patch
-%patch66 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch67 -p1 -b .ooo88375.filter.disablepdf.patch
-%patch68 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch69 -p1 -b .workspace.ucpgio1.patch
+%patch55 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch56 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch57 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch58 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch59 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch60 -p1 -b .ooo85691.vcl.tooltipcolor.patch
+%patch61 -p1 -b .ooo87991.fpickersafe.patch
+%patch62 -p1 -b .ooo88260.decl-defi-mismatch.patch
+%patch63 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch64 -p1 -b .oo88319.setup_native.missing.patch
+%patch65 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch66 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch67 -p1 -b .workspace.ucpgio1.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3310,6 +3306,8 @@
 %changelog
 * Sat May 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.11.1
 - next version
+- drop integrated workspace.cmcfixes43.patch
+- drop integrated openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
 
 * Wed Apr 30 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.10.1
 - next version

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pseudoworkspace.valgrind1.patch	15 Apr 2008 13:56:23 -0000	1.32
+++ pseudoworkspace.valgrind1.patch	4 May 2008 11:33:06 -0000	1.33
@@ -54,23 +54,6 @@
  
      Color				GetColor( USHORT nNum ) const;
  
-Index: source/inc/svdoimp.hxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/inc/svdoimp.hxx,v
-retrieving revision 1.11
-diff -u -r1.11 svdoimp.hxx
---- openoffice.org.orig/svx/source/inc/svdoimp.hxx	26 Nov 2007 14:51:11 -0000	1.11
-+++ openoffice.org/svx/source/inc/svdoimp.hxx	24 Jan 2008 11:57:41 -0000
-@@ -258,7 +258,8 @@
- 		basegfx::B2DPolyPolygon& rPoLi)
- 	:	mrLineAttr(rAttr),
- 		maAreaPolyPolygon(rPoPo),
--		maLinePolyPolygon(rPoLi)
-+		maLinePolyPolygon(rPoLi),
-+		mbLineDraft(false)
- 	{
- 	}
- 
 --- openoffice.org.orig/vcl/source/gdi/virdev.cxx	25 Oct 2007 16:04:52 -0000	1.31
 +++ openoffice.org/vcl/source/gdi/virdev.cxx	31 Mar 2008 09:54:45 -0000
 @@ -191,7 +191,8 @@ VirtualDevice::VirtualDevice( const Outp


--- openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch DELETED ---


--- workspace.cmcfixes43.patch DELETED ---