rpms/openoffice.org/devel openoffice.org-2.3.0.ooo74751.bean.mawt.patch, NONE, 1.1 openoffice.org.spec, 1.1294, 1.1295

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo74751.bean.mawt.patch 
Log Message:
add mawt patch for x86_64

openoffice.org-2.3.0.ooo74751.bean.mawt.patch:

--- NEW FILE openoffice.org-2.3.0.ooo74751.bean.mawt.patch ---
--- openoffice.org.orig/config_office/set_soenv.in	3 Aug 2007 13:09:48 -0000	1.156
+++ openoffice.org/config_office/set_soenv.in	29 Aug 2007 09:22:29 -0000
@@ -428,6 +428,7 @@
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
    }
    elsif ($platform =~ m/^sparc/)
  


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1294
retrieving revision 1.1295
diff -u -r1.1294 -r1.1295
--- openoffice.org.spec	4 Sep 2007 19:23:28 -0000	1.1294
+++ openoffice.org.spec	5 Sep 2007 06:50:00 -0000	1.1295
@@ -57,16 +57,16 @@
 Source5:        http://www.openoffice.org/nonav/issues/showattachment.cgi/36775/ooo64726.sdf
 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 >= %{jdk_ver}, zlib-devel, xerces-j2, prelink
+BuildRequires:  perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, prelink
+BuildRequires:	gdb, java-devel >= %{jdk_ver}, 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
 BuildRequires:	libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
-BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, hsqldb
+BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, xerces-j2
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel, vigra-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu
@@ -132,6 +132,7 @@
 Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
 Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1067,6 +1068,7 @@
 %patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch60 -p1 -b .ooo80967.ucb.neon27.patch
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch62 -p1 -b .ooo74751.bean.mawt.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2750,6 +2752,7 @@
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - rebuild against icu
 - rebuild against icedtea
+- add openoffice.org-2.3.0.ooo74751.bean.mawt.patch to allow build against icedtea
 - don't prefer gcj over icedtea when both installed
 - add ooo#81253 connectivity uninit fix
 - add ooo#81258 sw uninit fix