rpms/openoffice.org/devel openoffice.org.spec, 1.379, 1.380 openoffice.org-1.9.116.ooo51774.rsc.parallel.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-serv11162

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.116.ooo51774.rsc.parallel.patch 
Log Message:
another one goes


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- openoffice.org.spec	8 Aug 2005 16:31:18 -0000	1.379
+++ openoffice.org.spec	8 Aug 2005 16:50:24 -0000	1.380
@@ -161,25 +161,24 @@
 Patch43: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
 Patch44: workspace.gslpatches4.patch
 Patch45: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch46: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
-Patch47: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
-Patch48: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
-Patch49: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
-Patch50: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
-Patch51: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
-Patch52: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
-Patch53: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
-Patch54: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch55: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
-Patch56: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
-Patch57: openoffice.org-1.9.121.ooo53026.selinux-pipegiveup.desktop.patch
-Patch58: openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch
-Patch59: openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch
-Patch60: openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
-Patch61: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
-Patch62: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
-Patch63: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
-Patch64: openoffice.org-1.9.112.ooo53025.exception.package.patch
+Patch46: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
+Patch47: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch48: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch49: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
+Patch50: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
+Patch51: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
+Patch52: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
+Patch53: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch54: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
+Patch55: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+Patch56: openoffice.org-1.9.121.ooo53026.selinux-pipegiveup.desktop.patch
+Patch57: openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch
+Patch58: openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch
+Patch59: openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
+Patch60: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
+Patch61: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
+Patch62: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
+Patch63: openoffice.org-1.9.112.ooo53025.exception.package.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -821,31 +820,30 @@
 %patch43 -p1 -b .oooXXXXX.nostlport.patch
 %patch44 -p1 -b .workspace.gslpatches4.patch
 %patch45 -p1 -b .ooo51931.systemxmlsec.patch
-%patch46 -p1 -b .ooo51774.rsc.parallel.patch
-%patch47 -p1 -b .oooXXXXX.extensions.evolution.patch
-%patch48 -p1 -b .rh163147.thorndale.fontconfig.patch
-%patch49 -p1 -b .ooo51912.nullpointer.wizards.patch
-%patch50 -p1 -b .ooo52023.evoadb2.nognuconst.patch
-%patch51 -p1 -b .ooo52048.inhalt.sw.patch
-%patch52 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
-%patch53 -p1 -b .ooo49720.mozillanspr.extensions.patch
-%patch54 -p1 -b .ooo52428.execshield.bridges.patch
+%patch46 -p1 -b .oooXXXXX.extensions.evolution.patch
+%patch47 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch48 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch49 -p1 -b .ooo52023.evoadb2.nognuconst.patch
+%patch50 -p1 -b .ooo52048.inhalt.sw.patch
+%patch51 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
+%patch52 -p1 -b .ooo49720.mozillanspr.extensions.patch
+%patch53 -p1 -b .ooo52428.execshield.bridges.patch
 %if %{build_fc5}
-%patch55 -p1 -b .rh127576.gnomeprintui.patch
+%patch54 -p1 -b .rh127576.gnomeprintui.patch
 %endif
 %if %{cripplemenus}
-%patch56 -p1 -b .rh156677.cripplemenus.sysui.patch
+%patch55 -p1 -b .rh156677.cripplemenus.sysui.patch
 %endif
-%patch57 -p1 -b .ooo53026.selinux-pipegiveup.desktop.patch
-%patch58 -p1 -b .ooo52542.emptyrtfframes.sw.patch
-%patch59 -p1 -b .oooXXXXX.parallel.solenv.patch
-%patch60 -p1 -b .ooo52786.czech8bitdocimport.patch
+%patch56 -p1 -b .ooo53026.selinux-pipegiveup.desktop.patch
+%patch57 -p1 -b .ooo52542.emptyrtfframes.sw.patch
+%patch58 -p1 -b .oooXXXXX.parallel.solenv.patch
+%patch59 -p1 -b .ooo52786.czech8bitdocimport.patch
 %if ! %{internaljavabits}
-%patch61 -p1 -b .ooo52974.systemhsqldb.patch
-%patch62 -p1 -b .ooo52974.systembeanshell.patch
+%patch60 -p1 -b .ooo52974.systemhsqldb.patch
+%patch61 -p1 -b .ooo52974.systembeanshell.patch
 %endif
-%patch63 -p1 -b .ooo52626.workspacerestore.vcl.patch
-%patch64 -p1 -b .ooo53025.exception.package.patch
+%patch62 -p1 -b .ooo52626.workspacerestore.vcl.patch
+%patch63 -p1 -b .ooo53025.exception.package.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3100,6 +3098,7 @@
 - drop integrated ooo51736.xsltproc.evenwithjava.patch
 - drop integrated ooo51745.cpputools.patch
 - drop integrated ooo51755.scp2.parallel.patch
+- drop integrated ooo51774.rsc.parallel.patch
 
 * Fri Aug 05 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.122-4
 - session management and workspace restore corrections


--- openoffice.org-1.9.116.ooo51774.rsc.parallel.patch DELETED ---