aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-02-05 10:23:33 +0000
committerTimo Teräs <timo.teras@iki.fi>2015-02-05 10:23:33 +0000
commit80843bc4e29167c267b72fdc00d8136158fb70b6 (patch)
treeb6d5dcf3e5bd56065da8784ea0b1e9de50804b56
parentdc952a56a63145306efc93acd9a2f5dc08bce3d2 (diff)
downloadaports-80843bc4e29167c267b72fdc00d8136158fb70b6.tar.bz2
aports-80843bc4e29167c267b72fdc00d8136158fb70b6.tar.xz
testing/libreoffice: fix basic dependencies
abuild did not get them automaticall since libraries are in not in default search path; and binaries use rpath with $ORIGIN.
-rw-r--r--testing/libreoffice/APKBUILD14
1 files changed, 11 insertions, 3 deletions
diff --git a/testing/libreoffice/APKBUILD b/testing/libreoffice/APKBUILD
index 9b78c5295c..9ca94a13b4 100644
--- a/testing/libreoffice/APKBUILD
+++ b/testing/libreoffice/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=libreoffice
pkgver=4.4.0.3
-pkgrel=0
+pkgrel=1
pkgdesc="LibreOffice - Meta package for the full office suite"
url="http://www.libreoffice.org/"
arch="all"
@@ -117,8 +117,6 @@ package() {
}
_split() {
- depends=""
-
local i
for i in $(grep -v ^%dir $_builddir/file-lists/${1}_list.txt | sort -u); do
dirname="$(dirname $i)"
@@ -129,51 +127,61 @@ _split() {
base() {
pkgdesc="LibreOffice - Database frontend"
+ depends="libreoffice-common"
_split base
}
calc() {
pkgdesc="LibreOffice - Spreadsheet"
+ depends="libreoffice-common"
_split calc
}
common() {
pkgdesc="LibreOffice - Common files"
+ depends="libreoffice-lang-en_us"
_split common
}
draw() {
pkgdesc="LibreOffice - Drawing application"
+ depends="libreoffice-common"
_split draw
}
gnome() {
pkgdesc="LibreOffice - GNOME integration"
+ depends="libreoffice-common"
_split gnome
}
impress() {
pkgdesc="LibreOffice - Presentation application"
+ depends="libreoffice-common"
_split impress
}
en_us() {
pkgdesc="LibreOffice - English (US) language pack"
+ depends=""
_split lang_en_US
}
math() {
pkgdesc="LibreOffice - Equation editor"
+ depends="libreoffice-common"
_split math
}
postgres() {
pkgdesc="LibreOffice - Connector for PostgreSQL database"
+ depends="libreoffice-base"
_split postgresql
}
writer() {
pkgdesc="LibreOffice - Word Processor"
+ depends="libreoffice-common"
_split writer
}