rpms/openoffice.org/devel openoffice.org.spec,1.1620,1.1621

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16082

Modified Files:
	openoffice.org.spec 
Log Message:
fixup


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1620
retrieving revision 1.1621
diff -u -r1.1620 -r1.1621
--- openoffice.org.spec	20 Aug 2008 08:09:03 -0000	1.1620
+++ openoffice.org.spec	23 Aug 2008 15:35:21 -0000	1.1621
@@ -104,13 +104,12 @@
 Patch32: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
 Patch33: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
 Patch34: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
-Patch35: workspace.impress152.patch
-Patch36: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
-Patch37: workspace.dba301a.patch
-Patch38: openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch
-Patch39: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
-Patch40: workspace.fpicker8.patch
-Patch41: workspace.cmcfixes49.patch
+Patch35: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+Patch36: workspace.dba301a.patch
+Patch37: openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch
+Patch38: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
+Patch39: workspace.fpicker8.patch
+Patch40: workspace.cmcfixes49.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1283,13 +1282,12 @@
 %patch32 -p1 -b .ooo87970.vcl.samenamesubs.patch
 %patch33 -p1 -b .ooo48400.svx.fixspelling.patch
 %patch34 -p1 -b .ooo86142.serbiannumbering.patch
-%patch35 -p1 -b .workspace.impress152.patch
-%patch36 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
-%patch37 -p1 -b .workspace.dba301a.patch
-%patch38 -p1 -b .oooXXXXX.helpcontent2.fixlucene.patch
-%patch39 -p1 -b .ooo91904.sd.wrongindex.patch
-%patch40 -p1 -b .workspace.fpicker8.patch
-%patch41 -p1 -b .workspace.cmcfixes49.patch
+%patch35 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
+%patch36 -p1 -b .workspace.dba301a.patch
+%patch37 -p1 -b .oooXXXXX.helpcontent2.fixlucene.patch
+%patch38 -p1 -b .ooo91904.sd.wrongindex.patch
+%patch39 -p1 -b .workspace.fpicker8.patch
+%patch40 -p1 -b .workspace.cmcfixes49.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3654,6 +3652,7 @@
 - update to upstream dbaccess a11y solution
 - ooo#92920 enable building pdf importer against poppler and activate
   for fedora
+- drop integrated workspace.impress152.patch
 
 * Sat Aug 09 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-2.1
 - next milestone