rpms/openoffice.org/devel openoffice.org.spec, 1.1702, 1.1703 openoffice.org-3.0.0.ooo95341.cppcanvas.patch, 1.1, NONE workspace.dba301a.patch, 1.1, NONE workspace.impress163.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.0.0.ooo95341.cppcanvas.patch 
	workspace.dba301a.patch workspace.impress163.patch 
Log Message:
drop integrated patches


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1702
retrieving revision 1.1703
diff -u -r1.1702 -r1.1703
--- openoffice.org.spec	29 Nov 2008 12:51:25 -0000	1.1702
+++ openoffice.org.spec	29 Nov 2008 15:08:36 -0000	1.1703
@@ -105,33 +105,30 @@
 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.impress163.patch
-Patch36: workspace.dba301a.patch
-Patch37: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
-Patch38: workspace.fpicker8.patch
-Patch39: workspace.cmcfixes49.patch
-Patch40: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch41: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
-Patch42: workspace.cmcfixes50.patch
-Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
-Patch44: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
-Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
-Patch46: workspace.vcl94.patch
-Patch47: workspace.vcl95.patch
-Patch48: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
-Patch49: openoffice.org-3.0.0.ooo94659.sal.magazine.patch
-Patch50: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch51: openoffice.org-3.0.0.ooo95318.system-showicons.patch
-Patch52: workspace.vcl96.patch
-Patch53: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
-Patch54: openoffice.org-3.0.0.ooo95341.cppcanvas.patch
-Patch55: workspace.fwk92.patch
-Patch56: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
-Patch57: openoffice.org-3.0.0.ooo90653.pyuno.debugging.spew.patch
-Patch58: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
-Patch59: openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
-Patch60: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
-Patch61: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
+Patch35: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
+Patch36: workspace.fpicker8.patch
+Patch37: workspace.cmcfixes49.patch
+Patch38: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch39: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
+Patch40: workspace.cmcfixes50.patch
+Patch41: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
+Patch42: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
+Patch43: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
+Patch44: workspace.vcl94.patch
+Patch45: workspace.vcl95.patch
+Patch46: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
+Patch47: openoffice.org-3.0.0.ooo94659.sal.magazine.patch
+Patch48: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+Patch49: openoffice.org-3.0.0.ooo95318.system-showicons.patch
+Patch50: workspace.vcl96.patch
+Patch51: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
+Patch52: workspace.fwk92.patch
+Patch53: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch54: openoffice.org-3.0.0.ooo90653.pyuno.debugging.spew.patch
+Patch55: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
+Patch56: openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
+Patch57: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
+Patch58: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1361,33 +1358,30 @@
 %patch32 -p1 -b .ooo87970.vcl.samenamesubs.patch
 %patch33 -p1 -b .ooo48400.svx.fixspelling.patch
 %patch34 -p1 -b .ooo86142.serbiannumbering.patch
-%patch35 -p1 -b .workspace.impress163.patch
-%patch36 -p1 -b .workspace.dba301a.patch
-%patch37 -p1 -b .ooo91904.sd.wrongindex.patch
-%patch38 -p1 -b .workspace.fpicker8.patch
-%patch39 -p0 -b .workspace.cmcfixes49.patch
-%patch40 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch41 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
-%patch42 -p1 -b .workspace.cmcfixes50.patch
-%patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
-%patch44 -p1 -b .ooo93942.svx.accessibity-loops.patch
-%patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
-%patch46 -p1 -b .workspace.vcl94.patch
-%patch47 -p1 -b .workspace.vcl95.patch
-%patch48 -p1 -b .ooo94938.unopkg.handleexception.patch
-%patch49 -p1 -b .ooo94659.sal.magazine.patch
-%patch50 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch51 -p1 -b .ooo95318.system-showicons.patch
-%patch52 -p1 -b .workspace.vcl96.patch
-%patch53 -p1 -b .ooo95533.sw.safertableexport.patch
-%patch54 -p1 -b .ooo95341.cppcanvas.patch
-%patch55 -p1 -b .workspace.fwk92.patch
-%patch56 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
-%patch57 -p1 -b .ooo90653.pyuno.debugging.spew.patch
-%patch58 -p1 -b .ooo90072.sw.undo-longtext.patch
-%patch59 -p1 -b .ooo96203.sfx2.3layer-qstart.patch
-%patch60 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
-%patch61 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
+%patch35 -p1 -b .ooo91904.sd.wrongindex.patch
+%patch36 -p1 -b .workspace.fpicker8.patch
+%patch37 -p0 -b .workspace.cmcfixes49.patch
+%patch38 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch39 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
+%patch40 -p1 -b .workspace.cmcfixes50.patch
+%patch41 -p1 -b .ooo93515.vcl.jrb-frames.patch
+%patch42 -p1 -b .ooo93942.svx.accessibity-loops.patch
+%patch43 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
+%patch44 -p1 -b .workspace.vcl94.patch
+%patch45 -p1 -b .workspace.vcl95.patch
+%patch46 -p1 -b .ooo94938.unopkg.handleexception.patch
+%patch47 -p1 -b .ooo94659.sal.magazine.patch
+%patch48 -p1 -b .ooo95018.sal.fdwarnings.patch
+%patch49 -p1 -b .ooo95318.system-showicons.patch
+%patch50 -p1 -b .workspace.vcl96.patch
+%patch51 -p1 -b .ooo95533.sw.safertableexport.patch
+%patch52 -p1 -b .workspace.fwk92.patch
+%patch53 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch54 -p1 -b .ooo90653.pyuno.debugging.spew.patch
+%patch55 -p1 -b .ooo90072.sw.undo-longtext.patch
+%patch56 -p1 -b .ooo96203.sfx2.3layer-qstart.patch
+%patch57 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
+%patch58 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3757,6 +3751,9 @@
 * Sat Nov 29 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.1
 - Move to 3.0.1 preparation milestones
 - Resolves: rhbz#473553 font package splits
+- drop integrated workspace.impress163.patch
+- drop integrated workspace.dba301a.patch
+- drop integrated openoffice.org-3.0.0.ooo95341.cppcanvas.patch
 
 * Thu Nov 27 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.12
 - Require extra Norwegian hyphenators and thesauri


--- openoffice.org-3.0.0.ooo95341.cppcanvas.patch DELETED ---


--- workspace.dba301a.patch DELETED ---


--- workspace.impress163.patch DELETED ---