rpms/openoffice.org/F-9 openoffice.org.spec,1.1469,1.1470

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12267

Modified Files:
	openoffice.org.spec 
Log Message:
give up on openjdk, same problem


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1469
retrieving revision 1.1470
diff -u -r1.1469 -r1.1470
--- openoffice.org.spec	15 Apr 2008 16:17:29 -0000	1.1469
+++ openoffice.org.spec	16 Apr 2008 13:33:23 -0000	1.1470
@@ -16,7 +16,7 @@
 %define stlport_abi_lockin 0
 %endif
 # undef to build with openjdk
-%define jdk_is_gcj 0
+%define jdk_is_gcj 1
 
 %if %{stlport_abi_lockin}
 %define stlflags --with-stlport
@@ -151,7 +151,9 @@
 Patch78: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
 Patch79: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
 Patch80: openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
+%if ! %{jdk_is_gcj}
 Patch81: openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch
+%endif
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1117,7 +1119,9 @@
 %patch78 -p1 -b .ooo85691.vcl.tooltipcolor.patch
 %patch79 -p1 -b .ooo87991.fpickersafe.patch
 %patch80 -p1 -b .ooo88033.svx.a11ycrash.patch
+%if ! %{jdk_is_gcj}
 %patch81 -p1 -b .oooXXXXX.config_office.ppc.patch
+%endif
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`