rpms/openoffice.org/F-9 openoffice.org.spec,1.1467,1.1468

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
lets give building with openjdk a go instead then


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1467
retrieving revision 1.1468
diff -u -r1.1467 -r1.1468
--- openoffice.org.spec	12 Apr 2008 07:22:01 -0000	1.1467
+++ openoffice.org.spec	15 Apr 2008 14:22:49 -0000	1.1468
@@ -15,8 +15,8 @@
 %else
 %define stlport_abi_lockin 0
 %endif
-# undef to build with icedtea
-%define jdk_is_gcj 1
+# undef to build with openjdk
+%define jdk_is_gcj 0
 
 %if %{stlport_abi_lockin}
 %define stlflags --with-stlport
@@ -27,7 +27,7 @@
 %if %{jdk_is_gcj}
 %define java_devel java-1.5.0-devel
 %else
-%define java_devel java-1.7.0-devel
+%define java_devel java-1.6.0-devel
 %endif
 
 %if %{langpacks}
@@ -1163,12 +1163,10 @@
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=$[${SMP_MFLAGS/-j/}]
 if [ $SMP_MFLAGS -lt 2 ]; then SMP_MFLAGS=2; fi
-#DMAKE_SMP_MFLAGS=`dc -e "$SMP_MFLAGS v p"`
-#BUILD_SMP_MFLAGS=`dc -e "$SMP_MFLAGS $DMAKE_SMP_MFLAGS / p"`
-#DMAKE_SMP_MFLAGS=-P$DMAKE_SMP_MFLAGS
-#BUILD_SMP_MFLAGS=-P$BUILD_SMP_MFLAGS
-DMAKE_SMP_MFLAGS=-P1
-BUILD_SMP_MFLAGS=-P1
+DMAKE_SMP_MFLAGS=`dc -e "$SMP_MFLAGS v p"`
+BUILD_SMP_MFLAGS=`dc -e "$SMP_MFLAGS $DMAKE_SMP_MFLAGS / p"`
+DMAKE_SMP_MFLAGS=-P$DMAKE_SMP_MFLAGS
+BUILD_SMP_MFLAGS=-P$BUILD_SMP_MFLAGS
 #just in case you have a >16 proc box
 export MAXPROCESSLIMIT=65535
 #get core dumps
@@ -1343,6 +1341,9 @@
 $RPM_BUILD_ROOT/%{instdir}/program/unopkg list --shared || :
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/uno_packages/cache/* || :
 
+#lets just remove it regardless of the java used to build OOo
+rm -rf $RPM_BUILD_ROOT/%{instdir}/program/classes/sandbox.jar
+
 #add the debugging libsalalloc_malloc.so.3 library
 cp -f solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
 
@@ -1779,9 +1780,6 @@
 %{instdir}/program/classes/officebean.jar
 %{instdir}/program/classes/report.jar
 %{instdir}/program/classes/ridl.jar
-%if ! %{jdk_is_gcj}
-%{instdir}/program/classes/sandbox.jar
-%endif
 %{instdir}/program/classes/sdbc_hsqldb.jar
 %{instdir}/program/classes/ScriptFramework.jar
 %{instdir}/program/classes/ScriptProviderForBeanShell.jar