diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index cba4964a5f4..92b06bc431a 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -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