rpms/openoffice.org/devel openoffice.org.spec, 1.329, 1.330 openoffice.org-1.9.118.ooo52061.recursive.animations.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.118.ooo52061.recursive.animations.patch 
Log Message:
drop integrated patches


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- openoffice.org.spec	20 Jul 2005 12:24:47 -0000	1.329
+++ openoffice.org.spec	20 Jul 2005 12:36:22 -0000	1.330
@@ -161,9 +161,8 @@
 Patch60: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
 Patch61: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
 Patch62: openoffice.org-1.9.118.forwarddecl.psprint.patch
-Patch63: openoffice.org-1.9.118.ooo52061.recursive.animations.patch
-Patch64: workspace.qwizardsbfooo20.patch
-Patch65: openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch
+Patch63: workspace.qwizardsbfooo20.patch
+Patch64: openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -811,9 +810,8 @@
 %endif
 %patch61 -p1 -b .oooXXXXX.mozillanspr.extensions.patch
 %patch62 -p1 -b .forwarddecl.psprint.patch
-%patch63 -p1 -b .ooo52061.recursive.animations.patch
-%patch64 -p1 -R -b .workspace.qwizardsbfooo20.patch
-%patch65 -p1 -b .rhXXXXX.envcflags.solenv.patch
+%patch63 -p1 -R -b .workspace.qwizardsbfooo20.patch
+%patch64 -p1 -b .rhXXXXX.envcflags.solenv.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3022,6 +3020,7 @@
 - experiment with security flags
 - drop integrated cmcfixes11.workspace
 - drop integrated openoffice.org-1.9.113.ooo51385.bridges.stack.patch
+- drop integrated openoffice.org-1.9.118.ooo52061.recursive.animations.patch
 
 * Sat Jul 16 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.118-1
 - add experiemental rh150643.fontconfigalwayssystemfont.vcl.patch


--- openoffice.org-1.9.118.ooo52061.recursive.animations.patch DELETED ---