rpms/openoffice.org/devel openoffice.org.spec,1.1325,1.1326

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Wed Oct 17 15:25:10 UTC 2007


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
so force java-1.5.0-devel requires instead of java-devel to force all to be built with gcj


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1325
retrieving revision 1.1326
diff -u -r1.1325 -r1.1326
--- openoffice.org.spec	17 Oct 2007 11:42:07 -0000	1.1325
+++ openoffice.org.spec	17 Oct 2007 15:24:37 -0000	1.1326
@@ -22,7 +22,7 @@
 #b) jdk_ver when the default java-devel pulled in is icedtea on intel-alikes
 #c) and figure out if we want sandbox.jar
 %ifarch %{ix86} x86_64
-%define jdk_is_gcj 0
+%define jdk_is_gcj 1
 %else
 %define jdk_is_gcj 1
 %endif
@@ -35,10 +35,10 @@
 
 %if %{jdk_is_gcj}
 %define jdkflags --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
-%define jdk_ver 1.5.0
+%define java_devel java-1.5.0-devel
 %else
 %define jdkflags ''
-%define jdk_ver 1.7.0
+%define java_devel java-1.7.0-devel
 %endif
 
 %if %{langpacks}
@@ -67,7 +67,7 @@
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
 BuildRequires:  perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, prelink
-BuildRequires:	gdb, java-devel >= %{jdk_ver}, zlib-devel, vigra-devel, hsqldb
+BuildRequires:	gdb, %{java_devel}, zlib-devel, vigra-devel, hsqldb
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel




More information about the fedora-extras-commits mailing list