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

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- openoffice.org.spec	15 Jul 2005 11:43:58 -0000	1.308
+++ openoffice.org.spec	15 Jul 2005 11:51:18 -0000	1.309
@@ -3,19 +3,14 @@
 %define build_fc4 0
 %define build_fc5 1
 
-# undef to get english only and no-langpacks for a quick smoketest build
-%define langpacks 1
-%if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sv ta-IN th tr zh-CN zh-TW zu
-%else
-%define langpack_langs en-US
-%endif
 # gcc#19664#
 %define stlvisibilityfcked 1
 # rh#156039#
 %define includeexternals 1
-# undef to compile with gcc3 and gcj4 mixture
-%define gcc_is_gcc4 1
+# define to compile with gcc3 and gcj4 mixture
+%define usegcc3 0
+# undef to get english only and no-langpacks for a quick smoketest build
+%define langpacks 1
 
 %if %{build_fc4}
 %define release_extension .1.0.fc4
@@ -26,14 +21,16 @@
 %define internalxmlsec 0
 %endif
 
-%if %{gcc_is_gcc4}
-%define gij gij
-%define libgcj libgcj
-%define gccjava gcc-java
-%else
+%if %{usegcc3}
 %define gij gij4
 %define libgcj libgcj4
+%define libgcjdevel libgcj4-devel
 %define gccjava gcc4-java
+%else
+%define gij gij
+%define libgcj libgcj
+%define libgcjdevel libgcj-devel
+%define gccjava gcc-java
 %endif
 
 %if %{internalxmlsec}
@@ -54,6 +51,13 @@
 %define _use_internal_dependency_generator 0
 %endif
 
+%if %{langpacks}
+%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr gl gu-IN pa-IN he \
+	hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sv ta-IN th tr zh-CN zh-TW zu
+%else
+%define langpack_langs en-US
+%endif
+
 ExclusiveArch:  %{ix86} ppc
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
@@ -72,7 +76,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:  %{gccjava} >= 4.0.0, libgcj-devel >= 4.0.0
+BuildRequires:  %{gccjava} >= 4.0.0, %{libgcjdevel} >= 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
@@ -846,7 +850,7 @@
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
 
-%if ! %{gcc_is_gcc4}
+%if %{usegcc3}
 #this is needed for a mix of gcc/g++ 3.4.x and gcj/gij 4.0.x
 export GCJ_CFLAGS="-I`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`""include"
 export GCJ_LDFLAGS="-L`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`"