commit cf5b7e3aaaeb107ec175c0f8d3d20bdf09da5b31
Author: Jan Palus <[email protected]>
Date: Sat Mar 11 13:08:00 2023 +0100
make java runtime dependency optional
it appears lo uses java only for selected components and runs fine
without it. additionally java(ClassDataVersion) dependency mandates
installation of default jre that provides given java(ClassDataVersion)
meaning jre 8 cannot be installed cleanly as the default jre since lo
requires jre >= 9. lo however does not rely on default jre and scans
%{_libdir}/jvm for all available installations and is perfectly fine
with just *-jre-base package.
therefore disable java(ClassDataVersion) dependency and suggest jre used
during build instead.
libreoffice.spec | 5 +++++
1 file changed, 5 insertions(+)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 4094c94..35895fe 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libreoffice.git/commitdiff/cf5b7e3aaaeb107ec175c0f8d3d20bdf09da5b31
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
