rpms/openoffice.org/devel openoffice.org.spec,1.1291,1.1292

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
force in java-icedtea for ant


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1291
retrieving revision 1.1292
diff -u -r1.1291 -r1.1292
--- openoffice.org.spec	4 Sep 2007 18:56:53 -0000	1.1291
+++ openoffice.org.spec	4 Sep 2007 19:17:44 -0000	1.1292
@@ -1,11 +1,13 @@
 %define oootag OOG680
 %define ooomilestone 3
 %define rh_rpm_release 2
-#temp, fix configure
+#temporary until I fix configure to find gcj's jdk_home on its own
+#and when the default java-devel pulled in is icedtea on intel-alikes
 %ifnarch %{ix86} x86_64
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
 %define jdk_ver 1.5.0
 %else
+%define jdk_line 
 %define jdk_ver 1.7.0
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -2746,6 +2748,9 @@
 
 %changelog
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
+- rebuild against icu
+- rebuild against icedtea
+- don't prefer gcj over icedtea when both installed
 - add ooo#81253 connectivity uninit fix
 - add ooo#81258 sw uninit fix