From b19690de000b4e061e3fcad17c4b0b0825642e7b Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 19 Aug 2014 11:18:52 +0000 Subject: [PATCH] extra/libreoffice-fresh to 4.3.0-2 --- extra/libreoffice-fresh/PKGBUILD | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index fd29cacf8..147b17af6 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -11,7 +11,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=4.3.0.4 # RC4 = final pkgver=4.3.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -275,7 +275,8 @@ build() { --with-alloc=system \ --with-system-clucene \ --disable-dependency-tracking \ - --enable-hardlink-deliver #--help + --enable-hardlink-deliver \ + --with-jdk-home="/usr/lib/jvm/java-default-runtime" touch src.downloaded make build-nocheck @@ -294,8 +295,8 @@ build() { package_libreoffice-fresh-sdk() { pkgdesc="Software Development Kit for LibreOffice Fresh" depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - provides=('libreoffice-sdk' 'libreoffice-sdk-doc') - conflicts=('libreoffice-sdk' 'libreoffice-sdk-doc') + provides=('libreoffice-sdk' 'libreoffice-sdk-doc' 'libreoffice-still-sdk' 'libreoffice-still-sdk-doc') + conflicts=('libreoffice-sdk' 'libreoffice-sdk-doc' 'libreoffice-still-sdk' 'libreoffice-still-sdk-doc') for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do install -dm755 ${pkgdir}/${dir/\%dir/} @@ -347,7 +348,7 @@ package_libreoffice-fresh() { etc/profile.d/libreoffice-fresh.sh etc/profile.d/libreoffice-fresh.csh) install=$pkgbase.install - provides=('libreoffice-common' 'libreoffice-base' 'libreoffice-calc' + provides=('libreoffice' 'libreoffice-common' 'libreoffice-base' 'libreoffice-calc' 'libreoffice-draw' 'libreoffice-gnome' 'libreoffice-impress' 'libreoffice-kde4' 'libreoffice-math' 'libreoffice-writer' 'libreoffice-postgresql-connector' 'libreoffice-extension-wiki-publisher' @@ -356,7 +357,12 @@ package_libreoffice-fresh() { 'libreoffice-draw' 'libreoffice-gnome' 'libreoffice-impress' 'libreoffice-kde4' 'libreoffice-math' 'libreoffice-writer' 'libreoffice-extension-wiki-publisher' 'libreoffice-postgresql-connector' - 'libreoffice-extension-nlpsolver' 'libreoffice-en-US') + 'libreoffice-extension-nlpsolver' 'libreoffice-en-US' + 'libreoffice-still-common' 'libreoffice-still-base' 'libreoffice-still-calc' + 'libreoffice-still-draw' 'libreoffice-still-gnome' 'libreoffice-still-impress' + 'libreoffice-still-kde4' 'libreoffice-still-math' 'libreoffice-still-writer' + 'libreoffice-still-extension-wiki-publisher' 'libreoffice-still-postgresql-connector' + 'libreoffice-still-extension-nlpsolver' 'libreoffice-still-en-US') replaces=('libreoffice-fresh-en-US') mv fakeinstall/* ${pkgdir}/