- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases

Changed files:
    libreoffice.spec -> 1.861

diff --git a/libreoffice.spec b/libreoffice.spec
index cef720a1f3d1e85b64602b07103dfd6d5f75f6bc..c4b93bef9242c8933676a0bb1866f4e1db87528e 100644 (file)
--- 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}