rpms/openoffice.org/devel openoffice.org.spec,1.400,1.401

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29482

Modified Files:
	openoffice.org.spec 
Log Message:
apply in this order


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- openoffice.org.spec	21 Aug 2005 13:41:12 -0000	1.400
+++ openoffice.org.spec	21 Aug 2005 13:50:59 -0000	1.401
@@ -123,20 +123,20 @@
 Patch4:  openoffice.org-1.9.87.rh151357.setlangtolocale.patch
 Patch5:  openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
 Patch6:  openoffice.org-1.9.97.rh156067.noversionedicons.patch
-Patch7:  openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
-Patch8:  openoffice.org-1.9.121.rh127576.gnomeprintui.patch
-Patch9:  openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
-Patch10: openoffice.org-1.9.74.ooo41875.mktemp.patch
-Patch11: openoffice.org-1.9.84.ooo44843.sdcasting.patch
-Patch12: openoffice.org-1.9.84.ooo44846.svxcasting.patch
-Patch13: openoffice.org-1.9.84.ooo45162.svxcasting2.patch
-Patch14: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch15: openoffice.org-1.9.87.warnnoterroronmissing.patch
-Patch16: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
-Patch17: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
-Patch18: openoffice.org-1.9.89.ooo51873.parallel.sysui.patch
-Patch19: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
-Patch20: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
+Patch7:  openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
+Patch8:  openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch9:  openoffice.org-1.9.121.rh127576.gnomeprintui.patch
+Patch10: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+Patch11: openoffice.org-1.9.74.ooo41875.mktemp.patch
+Patch12: openoffice.org-1.9.84.ooo44843.sdcasting.patch
+Patch13: openoffice.org-1.9.84.ooo44846.svxcasting.patch
+Patch14: openoffice.org-1.9.84.ooo45162.svxcasting2.patch
+Patch15: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
+Patch16: openoffice.org-1.9.87.warnnoterroronmissing.patch
+Patch17: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
+Patch18: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
+Patch19: openoffice.org-1.9.89.ooo51873.parallel.sysui.patch
+Patch20: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
 Patch21: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch
 Patch22: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
 Patch23: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
@@ -774,24 +774,24 @@
 %patch4  -p1 -b .rh151357.setlangtolocale.patch
 %patch5  -p1 -b .rh151356.usetwodotzeropath.patch
 %patch6  -p1 -b .rh156067.noversionedicons.patch
-%patch7  -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch7  -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch
+%patch8  -p1 -b .rh163147.thorndale.fontconfig.patch
 %if %{build_fc5}
-%patch8  -p1 -b .rh127576.gnomeprintui.patch
+%patch9  -p1 -b .rh127576.gnomeprintui.patch
 %endif
 %if %{cripplemenus}
-%patch9  -p1 -b .rh156677.cripplemenus.sysui.patch
+%patch10  -p1 -b .rh156677.cripplemenus.sysui.patch
 %endif
-%patch10 -p1 -b .ooo41875.mktemp.patch
-%patch11 -p1 -b .ooo44843.sdcasting.patch
-%patch12 -p1 -b .ooo44846.svxcasting.patch
-%patch13 -p1 -b .ooo45162.svxcasting2.patch
-%patch14 -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch15 -p1 -b .warnnoterroronmissing.patch
-%patch16 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
-%patch17 -p1 -b .ooo35627.parallel.cppumaker.patch
-%patch18 -p1 -b .ooo51873.parallel.sysui.patch
-%patch19 -p1 -b .ooo44027.pthreadchange.patch
-%patch20 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch
+%patch11 -p1 -b .ooo41875.mktemp.patch
+%patch12 -p1 -b .ooo44843.sdcasting.patch
+%patch13 -p1 -b .ooo44846.svxcasting.patch
+%patch14 -p1 -b .ooo45162.svxcasting2.patch
+%patch15 -p1 -b .ooo45725.lingucomponent.contribdict.patch
+%patch16 -p1 -b .warnnoterroronmissing.patch
+%patch17 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
+%patch18 -p1 -b .ooo35627.parallel.cppumaker.patch
+%patch19 -p1 -b .ooo51873.parallel.sysui.patch
+%patch20 -p1 -b .ooo44027.pthreadchange.patch
 %patch21 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
 %patch22 -p1 -b .ooo35641.noxfonts.vcl.patch
 %patch23 -p1 -b .ooo48256.nolongname.sysui.patch