Merge pull request #6 from dsilakov/libreoffice:rosa2014.1

Use embedded hsqldb sources

.abf.yml

@@ -8,6 +8,7 @@ removed_sources:
   libreoffice-translations-4.3.0.4.tar.xz: 5741002440802f65a1ddaf20ff6505c432762a38
   libreoffice-translations-4.3.1.1.tar.xz: 7523d06dff88cf6173e66ac135ca0f78f7ae5267
 sources:
+  17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: 7168b0f40aa5c72267899601c116d2348d2f56ec
   09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt: 42c9235d7f876645ea6553770e7572c1b0b8609a
   1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz: 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3
   185d60944ea767075d27247c3162b3bc-unowinreg.dll: 0619ed3a89644bef318df67db12045b2b590585b

libreoffice.spec

@@ -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
@@ -59,6 +59,7 @@ Url:		http://www.libreoffice.org
 Source4:	http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 
 Source10:	Mandriva-Rosa_Icons.tar.bz2
+Source33:       %{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 Source34:	%{devurl}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 Source35:	%{devurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 Source36:	%{devurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -229,7 +230,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 +266,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 +3309,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 \
@@ -3367,6 +3368,7 @@ mkdir -p external/tarballs
 ln -sf %{SOURCE2} external/tarballs/
 ln -sf %{SOURCE3} external/tarballs/
 cp %{SOURCE4} external/tarballs/
+ln -sf %{SOURCE33} external/tarballs/
 ln -sf %{SOURCE34} external/tarballs/
 ln -sf %{SOURCE35} external/tarballs/
 ln -sf %{SOURCE36} external/tarballs/