[arch-commits] Commit in libreoffice/trunk (PKGBUILD.40)

[Andreas Radke]

    Date: Sunday, February 3, 2013 @ 12:40:01
  Author: andyrtr
Revision: 176987

prepare 4.0 release; use internal hsqldb that will allow to drop our own long time outdated pkg

Modified:
  libreoffice/trunk/PKGBUILD.40

-------------+
 PKGBUILD.40 |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD.40
===================================================================
--- PKGBUILD.40	2013-02-03 11:04:50 UTC (rev 176986)
+++ PKGBUILD.40	2013-02-03 11:40:01 UTC (rev 176987)
@@ -19,14 +19,14 @@
 	'libreoffice-extension-report-builder'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.0.0.2
+_LOver=4.0.0.3
 pkgver=4.0.0
-pkgrel=0.rc2.1
+pkgrel=0.rc3.1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
              'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez'
@@ -72,6 +72,7 @@
 	${_additional_source_url}/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
 	${_additional_source_url}/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2
 	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	${_additional_source_url}/libcdr-0.0.9.tar.bz2
 	${_additional_source_url}/libmspub-0.0.3.tar.bz2
@@ -106,12 +107,13 @@
 	8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
 	54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	libcdr-0.0.9.tar.bz2
 	libmspub-0.0.3.tar.bz2
 	libvisio-0.0.24.tar.bz2)
-md5sums=('d861dfa6d29851b3266ead28ba3ed7dc'
-         'bf488979d1d66744d082e34fc9e429cd'
-         '4cc5d35ec71c3f4d11464a61b389f7cb'
+md5sums=('a3c01489036823e9f5b5caf3a8db1f9e'
+         '716f624d7a39b99da8a5d550b6a87875'
+         '09ec7331354c6f9a0b2f48efe344ce7d'
          'f02578f5218f217a9f20e9c30e119c6a'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -139,6 +141,7 @@
          '8755aac23317494a9028569374dc87b2'
          '54e578c91b1b68e69c72be22adcb2195'
          '0168229624cfac409e766913506961a8'
+         '17410483b5b5f267aa18b7e00b65e6e0'
          '185d60944ea767075d27247c3162b3bc'
          '3c0037fb07dea2f0bbae8386fa7c6a9a'
          'b2db54b6e96287ac995d7ed654ace4fc'
@@ -242,7 +245,7 @@
 		--with-system-libs\
 		--with-system-mythes\
 		--with-system-headers\
-		--with-system-hsqldb \
+		--without-system-hsqldb \
 		--with-alloc=system\
 		--with-system-clucene\
 		--without-system-servlet-api
@@ -335,7 +338,7 @@
 package_libreoffice-base() {
  pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
  install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
+ depends=('libreoffice-common')
  optdepends=('libreoffice-postgresql-connector')
  backup=()
  groups=('libreoffice')