rpms/openoffice.org/devel openoffice.org.spec,1.1289,1.1290

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
tweak


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1289
retrieving revision 1.1290
diff -u -r1.1289 -r1.1290
--- openoffice.org.spec	4 Sep 2007 18:36:39 -0000	1.1289
+++ openoffice.org.spec	4 Sep 2007 18:53:54 -0000	1.1290
@@ -4,6 +4,9 @@
 #temp, fix configure
 %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_ver 1.7.0
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -53,7 +56,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, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires:	gdb, java-devel, zlib-devel, xerces-j2, prelink, vigra-devel
+BuildRequires:	gdb, java_devel >= %{jdk_ver}, zlib-devel, xerces-j2, prelink
 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
@@ -61,7 +64,7 @@
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
 BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, hsqldb
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel, vigra-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu