adjust jvm path to libreoffice expectations

[packages/libreoffice.git] / libreoffice.spec

diff --git a/libreoffice.spec b/libreoffice.spec
index 46c18f8a45b3464eceb47ecc8dfdc5ff5d8ef6cf..694a3a38c0dc126a66e698b4fd12a53db217182e 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -143,7 +143,7 @@ BuildRequires:      freetype-devel >= 1:2.8.1
 BuildRequires: gdb
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.38
-#BuildRequires:        gobject-introspection-devel >= 1.32.0
+%{?with_introspection:BuildRequires:   gobject-introspection-devel >= 1.32.0}
 BuildRequires: gperf
 BuildRequires: gpgme-c++-devel
 BuildRequires: graphite2-devel >= 0.9.3
@@ -333,6 +333,8 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _noautostrip    .*%{_datadir}/.*
 %define                _noautochrpath  .*%{_datadir}/.*
 
+%define                _noautoreq_java ClassDataVersion
+
 %description
 LibreOffice is an open-source project sponsored by Sun Microsystems
 and hosted by CollabNet. In October of 2000, Sun released the source
@@ -808,6 +810,9 @@ wymagane jest bardziej złożone, nieliniowe programowanie.
 Summary:       UNO Runtime Environment
 Summary(pl.UTF-8):     Środowisko uruchomieniowe UNO
 Group:         Libraries
+%if %{with java}
+%{?use_jdk:Suggests:   jre(%use_jdk)}
+%endif
 Obsoletes:     openoffice.org-ure < 1:4
 
 %description ure
@@ -3079,6 +3084,7 @@ export PATH=$PATH:%{_libdir}/interbase/bin
        --with-ant-home=$ANT_HOME \
        --with-java \
        --with-jdk-home=$JAVA_HOME \
+       --with-jvm-path=%{_libdir}/ \
 %else
        --without-java
 %endif
@@ -3094,7 +3100,6 @@ export ARCH_FLAGS_OPT="$SAFE_CFLAGS"
 export LC_ALL=C.UTF-8
 
 %{__make} -j1 verbose=true build
-#-nocheck
 
 %if %{with tests}
 %{__make} -j1 verbose=true check
@@ -3547,10 +3552,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/senddoc
 %attr(755,root,root) %{_libdir}/%{name}/program/uri-encode
 
-# without system orcus
-%attr(755,root,root) %{_libdir}/%{name}/program/liborcus-0.17.so.0
-%attr(755,root,root) %{_libdir}/%{name}/program/liborcus-parser-0.17.so.0
-
 %if %{with java}
 %attr(755,root,root) %{_libdir}/%{name}/program/libhsqldb.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libjdbclo.so