rpms/openoffice.org/devel openoffice.org.spec, 1.146, 1.147 workspace-gcj4.patch, 1.6, NONE

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace-gcj4.patch 
Log Message:
drop integrated workspace gcj4


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- openoffice.org.spec	11 Apr 2005 20:05:01 -0000	1.146
+++ openoffice.org.spec	11 Apr 2005 20:21:31 -0000	1.147
@@ -54,35 +54,34 @@
 Patch10: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
 Patch11: openoffice.org-1.9.85.ooo45146.mandrakelicence.patch
 Patch12: openoffice.org-1.9.84.ooo45162.svxcasting2.patch
-Patch13: workspace-gcj4.patch
-Patch14: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
-Patch15: openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.patch
-Patch16: openoffice.org-1.9.87.warnnoterroronmissing.patch
-Patch17: openoffice.org-1.9.87.rh151357.patch
-Patch18: openoffice.org-1.9.87.oooXXXXX.fragments.patch
-Patch19: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch20: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
-Patch21: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
-Patch22: openoffice.org-1.9.89.ooo46228.parallel.solenv.patch
-Patch23: openoffice.org-1.9.89.ooo46316.parallel.vcl.patch
-Patch24: openoffice.org-1.9.89.ooo46389.parallel.framework.patch
-Patch25: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
-Patch26: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
-Patch27: openoffice.org-1.9.89.oooXXXXX.systemjpeg.tools.patch
-Patch28: openoffice.org-1.9.89.ooo46481.parallel.svx.patch
-Patch29: openoffice.org-1.9.89.ooo46528.stillnotpic.icu.patch
-Patch30: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
-Patch31: openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch
-Patch32: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
-Patch33: openoffice.org-1.9.89.rh152269.nfs.desktop.patch
-Patch34: openoffice.org-1.9.89.rhXXXXX.bastardingppcgivesillegalinstructionrandomly.sysui.patch
-Patch35: openoffice.org-1.9.89.ooo46998.changeppclinkflags.solenv.patch
-Patch36: openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch
-Patch37: workspace.db4.patch
-Patch38: openoffice.org-1.9.91.ooo46539.sleep.vcl.patch
-Patch39: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
-Patch40: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
-Patch41: openoffice.org-1.9.91.ooo46603.boost.sd.patch
+Patch13: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
+Patch14: openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.patch
+Patch15: openoffice.org-1.9.87.warnnoterroronmissing.patch
+Patch16: openoffice.org-1.9.87.rh151357.patch
+Patch17: openoffice.org-1.9.87.oooXXXXX.fragments.patch
+Patch18: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch19: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
+Patch20: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
+Patch21: openoffice.org-1.9.89.ooo46228.parallel.solenv.patch
+Patch22: openoffice.org-1.9.89.ooo46316.parallel.vcl.patch
+Patch23: openoffice.org-1.9.89.ooo46389.parallel.framework.patch
+Patch24: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
+Patch25: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
+Patch26: openoffice.org-1.9.89.oooXXXXX.systemjpeg.tools.patch
+Patch27: openoffice.org-1.9.89.ooo46481.parallel.svx.patch
+Patch28: openoffice.org-1.9.89.ooo46528.stillnotpic.icu.patch
+Patch29: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
+Patch30: openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch
+Patch31: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
+Patch32: openoffice.org-1.9.89.rh152269.nfs.desktop.patch
+Patch33: openoffice.org-1.9.89.rhXXXXX.bastardingppcgivesillegalinstructionrandomly.sysui.patch
+Patch34: openoffice.org-1.9.89.ooo46998.changeppclinkflags.solenv.patch
+Patch35: openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch
+Patch36: workspace.db4.patch
+Patch37: openoffice.org-1.9.91.ooo46539.sleep.vcl.patch
+Patch38: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
+Patch39: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
+Patch40: openoffice.org-1.9.91.ooo46603.boost.sd.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -585,35 +584,34 @@
 %patch10 -p1 -b .ooo45725.lingucomponent.contribdict.patch
 %patch11 -p1 -b .ooo45146.mandrakelicence.patch
 %patch12 -p1 -b .ooo45162.svxcasting2.patch
-%patch13 -p1 -b .workspace-gcj4.patch
-%patch14 -p1 -b .usetwodotzeropath.patch
-%patch15 -p1 -b .rh150650.gcjneedstoresolveallrequirements.patch
-%patch16 -p1 -b .warnnoterroronmissing.patch
-%patch17 -p1 -b .rh151357.patch
-%patch18 -p1 -b .oooXXXXX.fragments.patch
-%patch19 -p1 -b .gcc3gcj4.patch
-%patch20 -p1 -b .rh133741.alwaysgtk.patch
-%patch21 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
-%patch22 -p1 -b .ooo46228.parallel.solenv.patch
-%patch23 -p1 -b .ooo46316.parallel.vcl.patch
-%patch24 -p1 -b .ooo46389.parallel.framework.patch
-%patch25 -p1 -b .ooo35627.parallel.cppumaker.patch
-%patch26 -p1 -b .oooXXXXX.parallel.sysui.patch
-%patch27 -p1 -b .oooXXXXX.systemjpeg.tools.patch
-%patch28 -p1 -b .ooo46481.parallel.svx.patch
-%patch29 -p1 -b .ooo46528.stillnotpic.icu.patch
-%patch30 -p1 -b .ooo44027.pthreadchange.patch
-%patch31 -p1 -b .ooo46912.setjmpoutsidenamespace.binfilter.patch
-%patch32 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch
-%patch33 -p1 -b .rh152269.nfs.desktop.patch
-%patch34 -p1 -b .bastardingppcgivesillegalinstructionrandomly.sysui.patch
-%patch35 -p1 -b .ooo46998.changeppclinkflags.solenv.patch
-%patch36 -p1 -b .gccXXXXX.hsqldbproblems.hsqldb.patch
-%patch37 -p1 -R -b .workspace.db4.patch
-%patch38 -p1 -b .ooo46539.sleep.vcl.patch
-%patch39 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch
-%patch40 -p1 -b .ooo46585.sunmiscisnotstandard.filter.patch
-%patch41 -p1 -b .ooo46603.boost.sd.patch
+%patch13 -p1 -b .usetwodotzeropath.patch
+%patch14 -p1 -b .rh150650.gcjneedstoresolveallrequirements.patch
+%patch15 -p1 -b .warnnoterroronmissing.patch
+%patch16 -p1 -b .rh151357.patch
+%patch17 -p1 -b .oooXXXXX.fragments.patch
+%patch18 -p1 -b .gcc3gcj4.patch
+%patch19 -p1 -b .rh133741.alwaysgtk.patch
+%patch20 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
+%patch21 -p1 -b .ooo46228.parallel.solenv.patch
+%patch22 -p1 -b .ooo46316.parallel.vcl.patch
+%patch23 -p1 -b .ooo46389.parallel.framework.patch
+%patch24 -p1 -b .ooo35627.parallel.cppumaker.patch
+%patch25 -p1 -b .oooXXXXX.parallel.sysui.patch
+%patch26 -p1 -b .oooXXXXX.systemjpeg.tools.patch
+%patch27 -p1 -b .ooo46481.parallel.svx.patch
+%patch28 -p1 -b .ooo46528.stillnotpic.icu.patch
+%patch29 -p1 -b .ooo44027.pthreadchange.patch
+%patch30 -p1 -b .ooo46912.setjmpoutsidenamespace.binfilter.patch
+%patch31 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch
+%patch32 -p1 -b .rh152269.nfs.desktop.patch
+%patch33 -p1 -b .bastardingppcgivesillegalinstructionrandomly.sysui.patch
+%patch34 -p1 -b .ooo46998.changeppclinkflags.solenv.patch
+%patch35 -p1 -b .gccXXXXX.hsqldbproblems.hsqldb.patch
+%patch36 -p1 -R -b .workspace.db4.patch
+%patch37 -p1 -b .ooo46539.sleep.vcl.patch
+%patch38 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch
+%patch39 -p1 -b .ooo46585.sunmiscisnotstandard.filter.patch
+%patch40 -p1 -b .ooo46603.boost.sd.patch
 
 cd solenv/bin
 tar xvzf %{SOURCE2} Archive-Zip-1.13/lib
@@ -2327,6 +2325,7 @@
 %changelog
 * Mon Apr 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.92-1
 - bump to next version
+- drop integrated workspace-gcj4.patch
 
 * Mon Apr 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.91-2
 - scripting framework builds with gcj now


--- workspace-gcj4.patch DELETED ---