rpms/openoffice.org/devel openoffice.org.spec, 1.348, 1.349 openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch, 1.5, NONE openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch, 1.2, NONE openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch, 1.5, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jul 23 23:30:54 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15108
Modified Files:
openoffice.org.spec
Removed Files:
openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
Log Message:
alternative workaround
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- openoffice.org.spec 23 Jul 2005 18:31:28 -0000 1.348
+++ openoffice.org.spec 23 Jul 2005 23:30:38 -0000 1.349
@@ -125,46 +125,43 @@
Patch22: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
Patch23: openoffice.org-1.9.97.rh156067.noversionedicons.patch
Patch24: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
-#Patch25: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
-Patch26: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
-#Patch27: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
-Patch28: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
-Patch29: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
-Patch30: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
-Patch31: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
-Patch32: workspace.vcl39.patch
-Patch33: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
-Patch34: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
-Patch35: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
-Patch36: workspace.gslpatches2.patch
-Patch37: workspace.fpicandrpath.patch
-Patch38: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch39: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.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: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch44: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch45: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
-Patch46: openoffice.org-1.9.114.ooo51638.mailmerge.patch
-Patch47: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
-Patch48: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
-Patch49: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
-Patch50: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
-Patch51: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch52: openoffice.org-1.9.115.ooo51745.cpputools.patch
-Patch53: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
-Patch54: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
-Patch55: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
-Patch56: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
-Patch57: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
-Patch58: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
-Patch59: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
-Patch60: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
-Patch61: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
-Patch62: openoffice.org-1.9.118.forwarddecl.psprint.patch
-Patch63: openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch
-Patch64: openoffice.org-1.9.120.rh158977.execshield.bridges.patch
+Patch25: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
+Patch26: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
+Patch27: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
+Patch28: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
+Patch29: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
+Patch30: workspace.vcl39.patch
+Patch31: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
+Patch32: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
+Patch33: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
+Patch34: workspace.gslpatches2.patch
+Patch35: workspace.fpicandrpath.patch
+Patch36: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch37: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
+Patch38: openoffice.org-1.9.112.ooo51724.testtools.patch
+Patch39: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
+Patch40: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch41: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch42: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
+Patch43: openoffice.org-1.9.114.ooo51638.mailmerge.patch
+Patch44: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+Patch45: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
+Patch46: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
+Patch47: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
+Patch48: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch49: openoffice.org-1.9.115.ooo51745.cpputools.patch
+Patch50: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
+Patch51: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
+Patch52: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
+Patch53: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch54: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch55: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
+Patch56: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
+Patch57: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
+Patch58: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
+Patch59: openoffice.org-1.9.118.forwarddecl.psprint.patch
+Patch60: openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch
+Patch61: openoffice.org-1.9.120.rh158977.execshield.bridges.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -770,50 +767,47 @@
%patch22 -p1 -b .ooo48256.nolongname.sysui.patch
%patch23 -p1 -b .rh156067.noversionedicons.patch
%patch24 -p1 -b .ooo48600.rtfparseerror.svx.patch
-#%patch25 -p1 -b .gcc19870.gcjaccessproblem.filter.patch
-%patch26 -p1 -b .ooo48610.searchalltemplates.wizards.patch
-#%patch27 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
-%patch28 -p1 -b .use-fontconfig-everwhere.patch
-%patch29 -p1 -b .berkeleydb-jni-casting-misuse.patch
-%patch30 -p1 -b .ooo44627.sal.brokencondition.patch
-%patch31 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
-%patch32 -p1 -b .workspace.vcl39.patch
-%patch33 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
-%patch34 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
-%patch35 -p1 -b .ooo47323.binfilter.stupiddetect.patch
-%patch36 -p1 -b .workspace.gslpatches2.patch
-%patch37 -p1 -b .workspace.fpicandrpath.patch
-%patch38 -p1 -b .NONE.gcc3gcj4.patch
-%patch39 -p1 -b .ooo9290.goodies.epstoepdf.patch
-#%patch40 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
-%patch41 -p1 -b .ooo51724.testtools.patch
-%patch42 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-%patch43 -p1 -b .ooo51718.rpath.patch
-%patch44 -p1 -b .rh161886.rpath.desktop.patch
-%patch45 -p1 -b .ooo51637.solenv.pyuno.patch
+%patch25 -p1 -b .ooo48610.searchalltemplates.wizards.patch
+%patch26 -p1 -b .use-fontconfig-everwhere.patch
+%patch27 -p1 -b .berkeleydb-jni-casting-misuse.patch
+%patch28 -p1 -b .ooo44627.sal.brokencondition.patch
+%patch29 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
+%patch30 -p1 -b .workspace.vcl39.patch
+%patch31 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
+%patch32 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
+%patch33 -p1 -b .ooo47323.binfilter.stupiddetect.patch
+%patch34 -p1 -b .workspace.gslpatches2.patch
+%patch35 -p1 -b .workspace.fpicandrpath.patch
+%patch36 -p1 -b .NONE.gcc3gcj4.patch
+%patch37 -p1 -b .ooo9290.goodies.epstoepdf.patch
+%patch38 -p1 -b .ooo51724.testtools.patch
+%patch39 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
+%patch40 -p1 -b .ooo51718.rpath.patch
+%patch41 -p1 -b .rh161886.rpath.desktop.patch
+%patch42 -p1 -b .ooo51637.solenv.pyuno.patch
%if %{includeemailmerge}
-%patch46 -p1 -b .ooo51638.mailmerge.patch
+%patch43 -p1 -b .ooo51638.mailmerge.patch
%endif
-%patch47 -p1 -b .oooXXXXX.nostlport.patch
-%patch48 -p1 -b .ooo51673.printing.checkerror.patch
-%patch49 -p1 -b .ooo51735.audio.withoutnas.patch
-%patch50 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
-%patch51 -p1 -b .ooo51931.systemxmlsec.patch
-%patch52 -p1 -b .ooo51745.cpputools.patch
-%patch53 -p1 -b .ooo51755.scp2.parallel.patch
-%patch54 -p1 -b .ooo51774.rsc.parallel.patch
-%patch55 -p1 -b .oooXXXXX.extensions.evolution.patch
-%patch56 -p1 -b .rh163147.thorndale.fontconfig.patch
-%patch57 -p1 -b .ooo51912.nullpointer.wizards.patch
-%patch58 -p1 -b .ooo52023.evoadb2.nognuconst.patch
-%patch59 -p1 -b .ooo52048.inhalt.sw.patch
+%patch44 -p1 -b .oooXXXXX.nostlport.patch
+%patch45 -p1 -b .ooo51673.printing.checkerror.patch
+%patch46 -p1 -b .ooo51735.audio.withoutnas.patch
+%patch47 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
+%patch48 -p1 -b .ooo51931.systemxmlsec.patch
+%patch49 -p1 -b .ooo51745.cpputools.patch
+%patch50 -p1 -b .ooo51755.scp2.parallel.patch
+%patch51 -p1 -b .ooo51774.rsc.parallel.patch
+%patch52 -p1 -b .oooXXXXX.extensions.evolution.patch
+%patch53 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch54 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch55 -p1 -b .ooo52023.evoadb2.nognuconst.patch
+%patch56 -p1 -b .ooo52048.inhalt.sw.patch
%if %{build_fc5}
-%patch60 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
+%patch57 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
%endif
-%patch61 -p1 -b .oooXXXXX.mozillanspr.extensions.patch
-%patch62 -p1 -b .forwarddecl.psprint.patch
-# %patch63 -p1 -b .rhXXXXX.envcflags.solenv.patch
-%patch64 -p1 -b .rh158977.execshield.bridges.patch
+%patch58 -p1 -b .oooXXXXX.mozillanspr.extensions.patch
+%patch59 -p1 -b .forwarddecl.psprint.patch
+# %patch60 -p1 -b .rhXXXXX.envcflags.solenv.patch
+%patch61 -p1 -b .rh158977.execshield.bridges.patch
%if %{includeexternals}
#start ludicrous workaround
--- openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch DELETED ---
--- openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch DELETED ---
--- openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch DELETED ---
More information about the fedora-cvs-commits
mailing list