Try embedded hsqldb

This commit is contained in:
Denis Silakov 2014-09-05 06:55:28 -04:00
parent df1d742ee9
commit 50242b30f9

View file

@ -47,7 +47,7 @@ Version: 4.3.1
%if "%{beta}" != "" %if "%{beta}" != ""
Release: 0.%{beta}.1 Release: 0.%{beta}.1
%else %else
Release: 3 Release: 4
%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
@ -229,7 +229,7 @@ BuildRequires: ant
BuildRequires: ant-apache-regexp BuildRequires: ant-apache-regexp
BuildRequires: apache-commons-codec BuildRequires: apache-commons-codec
BuildRequires: apache-commons-lang BuildRequires: apache-commons-lang
BuildRequires: hsqldb1.8.0 # BuildRequires: hsqldb1.8.0
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
@ -265,9 +265,9 @@ Summary: LibreOffice office suite - database
Group: Office Group: Office
Requires: %{name}-common = %{EVRD} Requires: %{name}-common = %{EVRD}
# Heavy java deps # Heavy java deps
%if !%{javaless} # %if !%{javaless}
Requires: hsqldb1.8.0 # Requires: hsqldb1.8.0
%endif # %endif
%description base %description base
This package contains the database component for LibreOffice. This package contains the database component for LibreOffice.
@ -3308,8 +3308,8 @@ touch autogen.lastrun
--without-junit \ --without-junit \
%if %{javaless} %if %{javaless}
--with-ant-home="%{antpath}" \ --with-ant-home="%{antpath}" \
%else # %else
--with-system-hsqldb \ # --with-system-hsqldb \
%endif %endif
--with-lang="%{langs}" \ --with-lang="%{langs}" \
--without-myspell-dicts \ --without-myspell-dicts \