rpms/openoffice.org/devel openoffice.org.spec,1.1295,1.1296
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Sep 5 08:35:53 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15944
Modified Files:
openoffice.org.spec
Log Message:
icedtea issue
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1295
retrieving revision 1.1296
diff -u -r1.1295 -r1.1296
--- openoffice.org.spec 5 Sep 2007 06:50:00 -0000 1.1295
+++ openoffice.org.spec 5 Sep 2007 08:35:20 -0000 1.1296
@@ -1,15 +1,7 @@
%define oootag OOG680
%define ooomilestone 3
%define rh_rpm_release 2
-#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
%define langpacks 1
# undef to revert to the traditional print dialog
@@ -25,6 +17,13 @@
%else
%define stlport_abi_lockin 0
%endif
+#temporary until
+#a) jdk_line I fix configure to find gcj's jdk_home on its own
+#b) jdk_ver when the default java-devel pulled in is icedtea on intel-alikes
+#c) and figure out if we want sandbox.jar
+%ifnarch %{ix86} x86_64
+%define jdk_is_gcj
+%endif
%if %{stlport_abi_lockin}
%define stlflags --with-stlport4
@@ -32,6 +31,14 @@
%define stlflags --without-stlport4
%endif
+%if %{jdk_is_gcj}
+%define jdkflags --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
+%define jdk_ver 1.5.0
+%else
+%define jdkflags ''
+%define jdk_ver 1.7.0
+%endif
+
%if %{langpacks}
%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr-CS ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn-IN
%else
@@ -1081,7 +1088,7 @@
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdk_line} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}"!
--with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}"!
--with-poor-help-localizations="$POORHELPS"
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -1623,6 +1630,9 @@
%{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
@@ -2756,6 +2766,7 @@
- don't prefer gcj over icedtea when both installed
- add ooo#81253 connectivity uninit fix
- add ooo#81258 sw uninit fix
+- package sandbox.jar where available
* Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
- release candidate
More information about the fedora-extras-commits
mailing list