mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 18:43:00 +00:00
Suggest java subpackage even if built in javaless mode
This commit is contained in:
parent
5b180bc82c
commit
3257de51a9
1 changed files with 3 additions and 7 deletions
|
@ -45,9 +45,9 @@ Name: libreoffice
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.3.3
|
Version: 4.3.3
|
||||||
%if "%{beta}" != ""
|
%if "%{beta}" != ""
|
||||||
Release: 0.%{beta}.1
|
Release: 0.%{beta}.2
|
||||||
%else
|
%else
|
||||||
Release: 2
|
Release: 3
|
||||||
%endif
|
%endif
|
||||||
Source0: %{relurl}/%{ooname}-%{buildver}.tar.xz
|
Source0: %{relurl}/%{ooname}-%{buildver}.tar.xz
|
||||||
Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz
|
Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz
|
||||||
|
@ -241,8 +241,8 @@ BuildRequires: apache-commons-lang
|
||||||
BuildRequires: jakarta-commons-httpclient
|
BuildRequires: jakarta-commons-httpclient
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
BuildRequires: java-1.7.0-openjdk-devel
|
BuildRequires: java-1.7.0-openjdk-devel
|
||||||
Suggests: %{name}-java = %{EVRD}
|
|
||||||
%endif
|
%endif
|
||||||
|
Suggests: %{name}-java = %{EVRD}
|
||||||
# STLport-devel 4.5 + private patches are needed
|
# STLport-devel 4.5 + private patches are needed
|
||||||
BuildConflicts: STLport-devel
|
BuildConflicts: STLport-devel
|
||||||
# Requres to all our packages
|
# Requres to all our packages
|
||||||
|
@ -274,10 +274,6 @@ Group: Office
|
||||||
Requires: %{name}-common = %{EVRD}
|
Requires: %{name}-common = %{EVRD}
|
||||||
Requires: %{name}-java = %{EVRD}
|
Requires: %{name}-java = %{EVRD}
|
||||||
Requires: java
|
Requires: java
|
||||||
# Heavy java deps
|
|
||||||
# %if !%{javaless}
|
|
||||||
# Requires: hsqldb1.8.0
|
|
||||||
# %endif
|
|
||||||
|
|
||||||
%description base
|
%description base
|
||||||
This package contains the database component for LibreOffice.
|
This package contains the database component for LibreOffice.
|
||||||
|
|
Loading…
Add table
Reference in a new issue