[libreoffice] more poxy RHEL-6 java

Caolán McNamara caolanm at fedoraproject.org
Tue Feb 19 15:11:00 UTC 2013


commit 60d4293e8e6430899b6675a9f371f4c0b5d15557
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 19 13:05:29 2013 +0000

    more poxy RHEL-6 java

 libreoffice.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 351e0eb..5db22af 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -207,10 +207,14 @@ BuildRequires: tomcat-servlet-3.0-api
 BuildRequires: bsh
 %if 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires: hsqldb
+%ifarch %{ix86} x86_64 s390 s390x
 BuildRequires: java-devel >= 1:1.6.0
 %else
 BuildRequires: java-devel
 %endif
+%else
+BuildRequires: java-devel
+%endif
 BuildRequires: jakarta-commons-httpclient
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: junit


More information about the scm-commits mailing list