From cff6a7eab6dc0b3e3aebe99a35e260f0caabe800 Mon Sep 17 00:00:00 2001 From: Jacek Konieczny Date: Sat, 17 Apr 2010 07:44:34 +0000 Subject: [PATCH] - do not pull java-sun via BR - icedtea6 should be enough in all (most) cases Changed files: libreoffice.spec -> 1.861 --- libreoffice.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index cef720a..c4b93be 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -250,14 +250,14 @@ BuildRequires: zlib-devel BuildRequires: ant BuildRequires: ant-apache-regexp %{?with_system_db:BuildRequires: db-java >= 4.3} -BuildRequires: java-sun >= 1.4.0_00 -BuildRequires: java-sun-jre-X11 -BuildRequires: java-sun-tools +BuildRequires: jdk >= 1.4.0_00 +BuildRequires: jre-X11 %endif BuildRequires: xulrunner-devel BuildConflicts: xmlsec1-devel # contains (dlopened) *.so libs BuildConflicts: xmlsec1-nss +BuildConflicts: java-gcj-compat Requires: %{name}-base = %{epoch}:%{version}-%{release} Requires: %{name}-calc = %{epoch}:%{version}-%{release} Requires: %{name}-draw = %{epoch}:%{version}-%{release} -- 2.44.0