rpms/openoffice.org/devel openoffice.org.spec, 1.318, 1.319 workspace.impress63.patch, 1.1, NONE workspace.mh19104.patch, 1.1, 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-serv28956

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.impress63.patch workspace.mh19104.patch 
Log Message:
drop known integrated


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- openoffice.org.spec	16 Jul 2005 11:49:05 -0000	1.318
+++ openoffice.org.spec	16 Jul 2005 11:52:56 -0000	1.319
@@ -138,31 +138,29 @@
 Patch37: workspace.fpicandrpath.patch
 Patch38: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
 Patch39: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
-Patch40: workspace.mh19104.patch
-Patch41: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
-Patch42: openoffice.org-1.9.112.ooo51724.testtools.patch
-Patch43: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
-Patch44: workspace.cmcfixes11.patch
-Patch45: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
-Patch46: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch47: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch48: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
-Patch49: openoffice.org-1.9.114.ooo51638.mailmerge.patch
-Patch50: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
-Patch51: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
-Patch52: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
-Patch53: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
-Patch54: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch55: openoffice.org-1.9.115.ooo51745.cpputools.patch
-Patch56: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
-Patch57: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
-Patch58: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
-Patch59: workspace.impress63.patch
-Patch60: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
-Patch61: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
-Patch62: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
-Patch63: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
-Patch64: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
+Patch40: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
+Patch41: openoffice.org-1.9.112.ooo51724.testtools.patch
+Patch42: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
+Patch43: workspace.cmcfixes11.patch
+Patch44: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
+Patch45: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch46: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch47: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
+Patch48: openoffice.org-1.9.114.ooo51638.mailmerge.patch
+Patch49: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+Patch50: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
+Patch51: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
+Patch52: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
+Patch53: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch54: openoffice.org-1.9.115.ooo51745.cpputools.patch
+Patch55: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
+Patch56: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
+Patch57: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
+Patch58: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch59: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch60: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
+Patch61: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
+Patch62: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -783,34 +781,32 @@
 %patch37 -p1 -b .workspace.fpicandrpath.patch
 %patch38 -p1 -b .NONE.gcc3gcj4.patch
 %patch39 -p1 -b .ooo9290.goodies.epstoepdf.patch
-%patch40 -p1 -b .workspace.mh19104.patch
-%patch41 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
-%patch42 -p1 -b .ooo51724.testtools.patch
-%patch43 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-%patch44 -p1 -b .workspace.cmcfixes11.patch
-%patch45 -p1 -b .ooo51385.bridges.stack.patch
-%patch46 -p1 -b .ooo51718.rpath.patch
-%patch47 -p1 -b .rh161886.rpath.desktop.patch
-%patch48 -p1 -b .ooo51637.solenv.pyuno.patch
+%patch40 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
+%patch41 -p1 -b .ooo51724.testtools.patch
+%patch42 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
+%patch43 -p1 -b .workspace.cmcfixes11.patch
+%patch44 -p1 -b .ooo51385.bridges.stack.patch
+%patch45 -p1 -b .ooo51718.rpath.patch
+%patch46 -p1 -b .rh161886.rpath.desktop.patch
+%patch47 -p1 -b .ooo51637.solenv.pyuno.patch
 %if %{includeemailmerge}
-%patch49 -p1 -b .ooo51638.mailmerge.patch
+%patch48 -p1 -b .ooo51638.mailmerge.patch
 %endif
-%patch50 -p1 -b .oooXXXXX.nostlport.patch
-%patch51 -p1 -b .ooo51673.printing.checkerror.patch
-%patch52 -p1 -b .ooo51735.audio.withoutnas.patch
-%patch53 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
-%patch54 -p1 -b .ooo51931.systemxmlsec.patch
-%patch55 -p1 -b .ooo51745.cpputools.patch
-%patch56 -p1 -b .ooo51755.scp2.parallel.patch
-%patch57 -p1 -b .ooo51774.rsc.parallel.patch
-%patch58 -p1 -b .oooXXXXX.extensions.evolution.patch
-%patch59 -p1 -b .workspace.impress63.patch
-%patch60 -p1 -b .rh163147.thorndale.fontconfig.patch
-%patch61 -p1 -b .ooo51912.nullpointer.wizards.patch
-%patch62 -p1 -b .ooo52023.evoadb2.nognuconst.patch
-%patch63 -p1 -b .ooo52048.inhalt.sw.patch
+%patch49 -p1 -b .oooXXXXX.nostlport.patch
+%patch50 -p1 -b .ooo51673.printing.checkerror.patch
+%patch51 -p1 -b .ooo51735.audio.withoutnas.patch
+%patch52 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
+%patch53 -p1 -b .ooo51931.systemxmlsec.patch
+%patch54 -p1 -b .ooo51745.cpputools.patch
+%patch55 -p1 -b .ooo51755.scp2.parallel.patch
+%patch56 -p1 -b .ooo51774.rsc.parallel.patch
+%patch57 -p1 -b .oooXXXXX.extensions.evolution.patch
+%patch58 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch59 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch60 -p1 -b .ooo52023.evoadb2.nognuconst.patch
+%patch61 -p1 -b .ooo52048.inhalt.sw.patch
 %if %{build_fc5}
-%patch64 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
+%patch62 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
 %endif
 
 %if %{includeexternals}
@@ -3015,6 +3011,8 @@
 %changelog
 * Sat Jul 16 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.118-1
 - add experiemental rh150643.fontconfigalwayssystemfont.vcl.patch
+- drop integrated workspace.impress63.patch
+- drop integrated workspace.mh19104.patch
 
 * Fri Jul 15 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.117-2
 - add openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch to


--- workspace.impress63.patch DELETED ---


--- workspace.mh19104.patch DELETED ---