[libreoffice/f16] Related: rhbz#753201 build with gcj-only toolchain

[David Tardon]

commit 0ead42ff78887272049af253bc6ab35f7dc9625a
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 17 13:28:47 2012 +0100

    Related: rhbz#753201 build with gcj-only toolchain

 ...z-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch |   48 ++++++++++++++++++++
 libreoffice.spec                                   |    2 +
 2 files changed, 50 insertions(+), 0 deletions(-)
---
diff --git a/0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch b/0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
new file mode 100644
index 0000000..a3ed7c4
--- /dev/null
+++ b/0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
@@ -0,0 +1,48 @@
+From fd567018ec52a53b00b5da7782b3100177b2c028 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Fri, 11 Nov 2011 15:45:58 +0000
+Subject: [PATCH] Related: rhbz#753201 fedora ant+java-1.5.0-gcj won't resolve
+ env variables
+
+---
+ rhino/makefile.mk                 |    4 ++--
+ rhino/rhino1_5R5-find_swing.patch |    5 ++---
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/rhino/makefile.mk b/rhino/makefile.mk
+index 91117d9..577d030 100644
+--- a/rhino/makefile.mk
++++ b/rhino/makefile.mk
+@@ -58,9 +58,9 @@ FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
+ .IF "$(JAVACISGCJ)"=="yes"
+ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
++BUILD_ACTION=$(ANT) -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
+ .ELSE
+-BUILD_ACTION=TARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" $(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar
++BUILD_ACTION=$(ANT) -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar
+ .ENDIF
+ 
+ # --- Targets ------------------------------------------------------
+diff --git a/rhino/rhino1_5R5-find_swing.patch b/rhino/rhino1_5R5-find_swing.patch
+index 220c4f4..f074fa8 100644
+--- a/rhino/rhino1_5R5-find_swing.patch
++++ b/rhino/rhino1_5R5-find_swing.patch
+@@ -1,11 +1,10 @@
+ --- misc/rhino1_5R5/toolsrc/build.xml	2009-10-29 18:29:46.605524507 +0100
+ +++ misc/build/rhino1_5R5/toolsrc/build.xml	2009-10-29 18:29:26.536908810 +0100
+-@@ -12,6 +12,8 @@
++@@ -12,6 +12,7 @@
+        <os family="unix"/>
+      </and>
+    </condition>
+-+  <property environment="solenv"/>
+-+  <property name="swing_zip" value="${solenv.TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/>
+++  <property name="swing_zip" value="${TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/>
+    <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
+    <!-- rhino.jar from OpenJDK breaks build -->
+    <path id="nonMacPath">
+-- 
+1.7.6.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 549ba91..ef7f747 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -158,6 +158,7 @@ Patch40: libreoffice-rhel6poppler.patch
 Patch41: libreoffice-rhel6langs.patch
 %endif
 Patch42: solenv.fix.mk.inheritance.patch
+Patch43: 0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -980,6 +981,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch41 -p0 -b .rhel6langs.patch
 %endif
 %patch42 -p1 -b .solenv.fix.mk.inheritance.patch
+%patch43 -p1 -b .rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings