rpms/openoffice.org/devel openoffice.org.spec, 1.1415, 1.1416 openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch, 1.2, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch 
Log Message:
openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch integrated


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1415
retrieving revision 1.1416
diff -u -r1.1415 -r1.1416
--- openoffice.org.spec	4 Feb 2008 11:03:20 -0000	1.1415
+++ openoffice.org.spec	4 Feb 2008 11:41:09 -0000	1.1416
@@ -133,12 +133,11 @@
 Patch59: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
 Patch60: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 Patch61: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
-Patch62: openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
-Patch63: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch64: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch65: workspace.cairotext01.patch
-Patch66: workspace.gcc430two.patch
-Patch67: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch62: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch63: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch64: workspace.cairotext01.patch
+Patch65: workspace.gcc430two.patch
+Patch66: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1086,12 +1085,11 @@
 %patch59 -p1
 %patch60 -p1 -b .rh133741.alwaysgtk.vcl.patch
 %patch61 -p1 -b .ooo85385.svtools.a11ycrash.patch
-%patch62 -p1 -b .ooo85321.vcl.pixmapleak.patch
-%patch63 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch64 -p1 -b .ooo85448.emptyrpath.patch
-%patch65 -p1 -b .workspace.cairotext01.patch
-%patch66 -p1 -b .workspace.gcc430two.patch
-%patch67 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch62 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch63 -p1 -b .ooo85448.emptyrpath.patch
+%patch64 -p1 -b .workspace.cairotext01.patch
+%patch65 -p1 -b .workspace.gcc430two.patch
+%patch66 -p1 -b .ooo85854.sw.graphicsaveas.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2865,6 +2863,7 @@
 - drop integrated openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
 - drop openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
   now that we have gcc 4.3.0
+- drop integrated openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
 - add workspace.gcc430two.patch for some newly needed includes
 - add openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch for riel
 


--- openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch DELETED ---