rpms/openoffice.org/devel openoffice.org.spec,1.307,1.308

[fedora-cvs-commits redhat com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24820

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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- openoffice.org.spec	15 Jul 2005 11:34:49 -0000	1.307
+++ openoffice.org.spec	15 Jul 2005 11:43:58 -0000	1.308
@@ -29,11 +29,11 @@
 %if %{gcc_is_gcc4}
 %define gij gij
 %define libgcj libgcj
-%define gcc-java gcc-java
+%define gccjava gcc-java
 %else
 %define gij gij4
 %define libgcj libgcj4
-%define gcc-java gcc4-java
+%define gccjava gcc4-java
 %endif
 
 %if %{internalxmlsec}
@@ -72,7 +72,7 @@
 BuildRequires: 	perl, sed, zip, bzip2, unzip, tar, findutils
 BuildRequires: 	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires: 	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils
-BuildRequires:  %{gcc-java} >= 4.0.0, libgcj-devel >= 4.0.0
+BuildRequires:  %{gccjava} >= 4.0.0, libgcj-devel >= 4.0.0
 BuildRequires: 	java-1.4.2-gcj-compat-devel
 BuildRequires: 	libart_lgpl-devel >= 2.3.11, zlib-devel, freetype-devel, 
 BuildRequires: 	gtk2-devel >= 2.4.8, gnome-vfs2-devel, cups-devel, curl-devel