mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 10:32:59 +00:00
Try embedded hsqldb
This commit is contained in:
parent
df1d742ee9
commit
50242b30f9
1 changed files with 7 additions and 7 deletions
|
@ -47,7 +47,7 @@ Version: 4.3.1
|
|||
%if "%{beta}" != ""
|
||||
Release: 0.%{beta}.1
|
||||
%else
|
||||
Release: 3
|
||||
Release: 4
|
||||
%endif
|
||||
Source0: %{relurl}/%{ooname}-%{buildver}.tar.xz
|
||||
Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz
|
||||
|
@ -229,7 +229,7 @@ BuildRequires: ant
|
|||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: apache-commons-codec
|
||||
BuildRequires: apache-commons-lang
|
||||
BuildRequires: hsqldb1.8.0
|
||||
# BuildRequires: hsqldb1.8.0
|
||||
BuildRequires: jakarta-commons-httpclient
|
||||
BuildRequires: junit
|
||||
BuildRequires: java-1.7.0-openjdk-devel
|
||||
|
@ -265,9 +265,9 @@ Summary: LibreOffice office suite - database
|
|||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
# Heavy java deps
|
||||
%if !%{javaless}
|
||||
Requires: hsqldb1.8.0
|
||||
%endif
|
||||
# %if !%{javaless}
|
||||
# Requires: hsqldb1.8.0
|
||||
# %endif
|
||||
|
||||
%description base
|
||||
This package contains the database component for LibreOffice.
|
||||
|
@ -3308,8 +3308,8 @@ touch autogen.lastrun
|
|||
--without-junit \
|
||||
%if %{javaless}
|
||||
--with-ant-home="%{antpath}" \
|
||||
%else
|
||||
--with-system-hsqldb \
|
||||
# %else
|
||||
# --with-system-hsqldb \
|
||||
%endif
|
||||
--with-lang="%{langs}" \
|
||||
--without-myspell-dicts \
|
||||
|
|
Loading…
Add table
Reference in a new issue