[libreoffice] Resolves: rhbz#988737 no java 1:1.6 on non x86|x86_64 rhel-6
Caolán McNamara
caolanm at fedoraproject.org
Fri Jul 26 10:21:49 UTC 2013
commit 213dc35ca051f292aa09d1a751c4e84e36238fae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 26 11:21:20 2013 +0100
Resolves: rhbz#988737 no java 1:1.6 on non x86|x86_64 rhel-6
libreoffice.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 79a318e..f4eaa61 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -277,14 +277,14 @@ Summary: Core modules for LibreOffice
Group: Applications/Productivity
Requires: %{name}-%{fontname}-fonts = %{epoch}:%{version}-%{release}
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
-# rhbz#949106 libreoffice-core drags in both openjdk 1.7.0 and 1.8.0
-Requires: java >= 1:1.6
Requires: liberation-sans-fonts >= 1.0, liberation-serif-fonts >= 1.0, liberation-mono-fonts >= 1.0
Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
Requires: hyphen-en, hyphen >= 2.4, autocorr-en
%if 0%{?rhel} && 0%{?rhel} < 7
Requires: hunspell-en
%else
+# rhbz#949106 libreoffice-core drags in both openjdk 1.7.0 and 1.8.0
+Requires: java >= 1:1.6
Requires: hunspell-en-US
%endif
Requires(pre): gtk2 >= 2.9.4
More information about the scm-commits
mailing list