rpms/openoffice.org/devel openoffice.org.spec, 1.1426, 1.1427 openoffice.org-2.4.0.ooo85624.sw.headerfooters.patch, 1.1, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.4.0.ooo85624.sw.headerfooters.patch 
Log Message:
next version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1426
retrieving revision 1.1427
diff -u -r1.1426 -r1.1427
--- openoffice.org.spec	13 Feb 2008 09:31:28 -0000	1.1426
+++ openoffice.org.spec	13 Feb 2008 10:36:36 -0000	1.1427
@@ -140,8 +140,7 @@
 Patch66: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
 Patch67: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
 Patch68: openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
-Patch69: openoffice.org-2.4.0.ooo85624.sw.headerfooters.patch
-Patch70: openoffice.org-2.4.0.oooXXXXX.ucb.newneon.patch
+Patch69: openoffice.org-2.4.0.oooXXXXX.ucb.newneon.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1096,8 +1095,7 @@
 %patch66 -p1 -b .ooo85854.sw.graphicsaveas.patch
 %patch67 -p1 -b .ooo85921.sd.editmasterundermouse.patch
 %patch68 -p1 -b .ooo85931.svx.getentrypos.patch
-%patch69 -p1 -b .ooo85624.sw.headerfooters.patch
-%patch70 -p1 -b .oooXXXXX.ucb.newneon.patch
+%patch69 -p1 -b .oooXXXXX.ucb.newneon.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2870,6 +2868,7 @@
 * Wed Feb 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-7.1
 - Resolves: rhbz#432368 parallel build is err... "a little" aggressive
 - next milestone
+- drop integrated openoffice.org-2.4.0.ooo85624.sw.headerfooters.patch
 
 * Tue Feb 12 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-6.3
 - Resolves: rhbz#431805 openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch


--- openoffice.org-2.4.0.ooo85624.sw.headerfooters.patch DELETED ---