libreoffice: install to /usr; get rid of obsolete conflicts.
This commit is contained in:
parent
161c82f3fb
commit
47ed97b986
1 changed files with 2 additions and 3 deletions
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'libreoffice'
|
||||
pkgname=libreoffice
|
||||
version=5.1.2.2
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-werror"
|
||||
nopie=yes
|
||||
|
@ -46,7 +46,6 @@ skip_extraction="
|
|||
${pkgname}-dictionaries-${version}.tar.xz
|
||||
${pkgname}-help-${version}.tar.xz
|
||||
${pkgname}-translations-${version}.tar.xz"
|
||||
conflicts="libreoffice-bin>=0"
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) # Unit tests failure - unknown reason
|
||||
|
@ -55,7 +54,7 @@ case "$XBPS_TARGET_MACHINE" in
|
|||
esac
|
||||
|
||||
# Install location: either /usr or e.g. /opt/libreofficeX.Y.Z
|
||||
_LO_PREFIX=/opt/${pkgname}${version%.*.*}
|
||||
_LO_PREFIX=/usr/${pkgname}${version%.*.*}
|
||||
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
# mariadbclient can't currently be cross compiled
|
||||
|
|
Loading…
Reference in a new issue