rpms/openoffice.org/devel openoffice.org.spec, 1.395, 1.396 openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sun Aug 21 09:03:26 UTC 2005 

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch 
Log Message:
another integrated patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- openoffice.org.spec	20 Aug 2005 22:49:52 -0000	1.395
+++ openoffice.org.spec	21 Aug 2005 09:03:22 -0000	1.396
@@ -144,39 +144,38 @@
 Patch26: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
 Patch27: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
 Patch28: workspace.vcl39.patch
-Patch29: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
-Patch30: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
-Patch31: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
-Patch32: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch33: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
-Patch34: openoffice.org-1.9.112.ooo51724.testtools.patch
-Patch35: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
-Patch36: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch37: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch38: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
-Patch39: openoffice.org-1.9.114.ooo51638.mailmerge.patch
-Patch40: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
-Patch41: workspace.gslpatches4.patch
-Patch42: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch43: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
-Patch44: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
-Patch45: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
-Patch46: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
-Patch47: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
-Patch48: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
-Patch49: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
-Patch50: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch51: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
-Patch52: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
-Patch53: openoffice.org-1.9.121.ooo53026.selinux-pipegiveup.desktop.patch
-Patch54: openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch
-Patch55: openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch
-Patch56: openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
-Patch57: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
-Patch58: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
-Patch59: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
-Patch60: openoffice.org-1.9.112.ooo53025.exception.package.patch
-Patch61: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch29: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
+Patch30: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
+Patch31: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch32: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
+Patch33: openoffice.org-1.9.112.ooo51724.testtools.patch
+Patch34: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
+Patch35: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch36: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch37: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
+Patch38: openoffice.org-1.9.114.ooo51638.mailmerge.patch
+Patch39: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+Patch40: workspace.gslpatches4.patch
+Patch41: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch42: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
+Patch43: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch44: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch45: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
+Patch46: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
+Patch47: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
+Patch48: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
+Patch49: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch50: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
+Patch51: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+Patch52: openoffice.org-1.9.121.ooo53026.selinux-pipegiveup.desktop.patch
+Patch53: openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch
+Patch54: openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch
+Patch55: openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
+Patch56: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
+Patch57: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
+Patch58: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
+Patch59: openoffice.org-1.9.112.ooo53025.exception.package.patch
+Patch60: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -798,47 +797,46 @@
 %patch26 -p1 -b .ooo44627.sal.brokencondition.patch
 %patch27 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
 %patch28 -p1 -b .workspace.vcl39.patch
-%patch29 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
-%patch30 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
-%patch31 -p1 -b .ooo47323.binfilter.stupiddetect.patch
-%patch32 -p1 -b .NONE.gcc3gcj4.patch
-%patch33 -p1 -b .ooo9290.goodies.epstoepdf.patch
-%patch34 -p1 -b .ooo51724.testtools.patch
-%patch35 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-%patch36 -p1 -b .ooo51718.rpath.patch
-%patch37 -p1 -b .rh161886.rpath.desktop.patch
-%patch38 -p1 -b .ooo51637.solenv.pyuno.patch
+%patch29 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
+%patch30 -p1 -b .ooo47323.binfilter.stupiddetect.patch
+%patch31 -p1 -b .NONE.gcc3gcj4.patch
+%patch32 -p1 -b .ooo9290.goodies.epstoepdf.patch
+%patch33 -p1 -b .ooo51724.testtools.patch
+%patch34 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
+%patch35 -p1 -b .ooo51718.rpath.patch
+%patch36 -p1 -b .rh161886.rpath.desktop.patch
+%patch37 -p1 -b .ooo51637.solenv.pyuno.patch
 %if %{includeemailmerge}
-%patch39 -p1 -b .ooo51638.mailmerge.patch
+%patch38 -p1 -b .ooo51638.mailmerge.patch
 %endif
-%patch40 -p1 -b .oooXXXXX.nostlport.patch
-%patch41 -p1 -b .workspace.gslpatches4.patch
-%patch42 -p1 -b .ooo51931.systemxmlsec.patch
-%patch43 -p1 -b .oooXXXXX.extensions.evolution.patch
-%patch44 -p1 -b .rh163147.thorndale.fontconfig.patch
-%patch45 -p1 -b .ooo51912.nullpointer.wizards.patch
-%patch46 -p1 -b .ooo52023.evoadb2.nognuconst.patch
-%patch47 -p1 -b .ooo52048.inhalt.sw.patch
-%patch48 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
-%patch49 -p1 -b .ooo49720.mozillanspr.extensions.patch
-%patch50 -p1 -b .ooo52428.execshield.bridges.patch
+%patch39 -p1 -b .oooXXXXX.nostlport.patch
+%patch40 -p1 -b .workspace.gslpatches4.patch
+%patch41 -p1 -b .ooo51931.systemxmlsec.patch
+%patch42 -p1 -b .oooXXXXX.extensions.evolution.patch
+%patch43 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch44 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch45 -p1 -b .ooo52023.evoadb2.nognuconst.patch
+%patch46 -p1 -b .ooo52048.inhalt.sw.patch
+%patch47 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
+%patch48 -p1 -b .ooo49720.mozillanspr.extensions.patch
+%patch49 -p1 -b .ooo52428.execshield.bridges.patch
 %if %{build_fc5}
-%patch51 -p1 -b .rh127576.gnomeprintui.patch
+%patch50 -p1 -b .rh127576.gnomeprintui.patch
 %endif
 %if %{cripplemenus}
-%patch52 -p1 -b .rh156677.cripplemenus.sysui.patch
+%patch51 -p1 -b .rh156677.cripplemenus.sysui.patch
 %endif
-%patch53 -p1 -b .ooo53026.selinux-pipegiveup.desktop.patch
-%patch54 -p1 -b .ooo52542.emptyrtfframes.sw.patch
-%patch55 -p1 -b .oooXXXXX.parallel.solenv.patch
-%patch56 -p1 -b .ooo52786.czech8bitdocimport.patch
+%patch52 -p1 -b .ooo53026.selinux-pipegiveup.desktop.patch
+%patch53 -p1 -b .ooo52542.emptyrtfframes.sw.patch
+%patch54 -p1 -b .oooXXXXX.parallel.solenv.patch
+%patch55 -p1 -b .ooo52786.czech8bitdocimport.patch
 %if ! %{internaljavabits}
-%patch57 -p1 -b .ooo52974.systemhsqldb.patch
-%patch58 -p1 -b .ooo52974.systembeanshell.patch
+%patch56 -p1 -b .ooo52974.systemhsqldb.patch
+%patch57 -p1 -b .ooo52974.systembeanshell.patch
 %endif
-%patch59 -p1 -b .ooo52626.workspacerestore.vcl.patch
-%patch60 -p1 -b .ooo53025.exception.package.patch
-%patch61 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch58 -p1 -b .ooo52626.workspacerestore.vcl.patch
+%patch59 -p1 -b .ooo53025.exception.package.patch
+%patch60 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3117,6 +3115,7 @@
 - beta2
 - drop integrated workspace.cmcfixes14.patch
 - drop integrated ooo46585.sunmiscisnotstandard.filter.patch
+- drop integrated ooo30133.lingucomponent.ukrainean.patch
 
 * Wed Aug 17 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.124-3
 - rh#166102# pspfontcache format problem hang on start


--- openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch DELETED ---

More information about the fedora-cvs-commits mailing list