rpms/openoffice.org/devel openoffice.org.spec, 1.210, 1.211 workspace.gcj5.patch, 1.1, 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-serv14377

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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- openoffice.org.spec	8 Jun 2005 15:48:11 -0000	1.210
+++ openoffice.org.spec	8 Jun 2005 15:57:25 -0000	1.211
@@ -91,11 +91,10 @@
 Patch39: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
 Patch40: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
 Patch41: workspace.gcc4fwdecl.patch
-Patch42: workspace.gcj5.patch
-Patch43: workspace-fpicker4.patch
-Patch44: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
-Patch45: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
-Patch46: workspace.vcl39.patch
+Patch42: workspace-fpicker4.patch
+Patch43: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
+Patch44: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
+Patch45: workspace.vcl39.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -704,11 +703,10 @@
 %patch39 -p1 -b .use-fontconfig-everwhere.patch
 %patch40 -p1 -b .berkeleydb-jni-casting-misuse.patch
 %patch41 -p1 -b .workspace.gcc4fwdecl.patch
-%patch42 -p1 -b .workspace.gcj5.patch
-%patch43 -p1 -b .workspace-fpicker4.patch
-%patch44 -p1 -b .ooo44627.sal.brokencondition.patch
-%patch45 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
-%patch46 -p1 -b .workspace.vcl39.patch
+%patch42 -p1 -b .workspace-fpicker4.patch
+%patch43 -p1 -b .ooo44627.sal.brokencondition.patch
+%patch44 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
+%patch45 -p1 -b .workspace.vcl39.patch
 
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
@@ -2520,6 +2518,7 @@
 - add workspace.vcl39.patch for rh#156176#
 - drop integrated openoffice.org-1.9.106.ooo50107.briges.noexecstack.patch
 - drop integrated openoffice.org-1.9.106.ooo45298.psprint.pspfontcache.patch
+- drop integrated workspace.gcj5.patch
 
 * Fri Jun 03 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.106-2
 - add openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch to fix (?) 


--- workspace.gcj5.patch DELETED ---