rpms/openoffice.org/devel openoffice.org.spec,1.1315,1.1316

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30111

Modified Files:
	openoffice.org.spec 
Log Message:
rhbz#326161 allow libgcj to be used with code compiled with icedtea


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1315
retrieving revision 1.1316
diff -u -r1.1315 -r1.1316
--- openoffice.org.spec	8 Oct 2007 07:25:44 -0000	1.1315
+++ openoffice.org.spec	10 Oct 2007 13:54:26 -0000	1.1316
@@ -1105,6 +1105,10 @@
 source Linux*Env.Set.sh
 #unneccessary to build for both hash types
 unset HAVE_LD_HASH_STYLE
+%if %{jdk_ver} >= 1.7.0
+#set target to 5 so that gcj can still be used as the jvm when built with icedtea
+export JAVACOMPILER="$JAVACOMPILER -target 5"
+%endif
 #faster build
 export nodep=true
 export NO_HIDS=true