From 9ae9aebd3ecfbd51287b6e3b9d18bee2907eb46b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 May 2016 07:01:37 +0200 Subject: [PATCH] libreoffice-i18n: sync prefix with libreoffice. --- srcpkgs/libreoffice-i18n/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libreoffice-i18n/template b/srcpkgs/libreoffice-i18n/template index 9419aaabfa1..4706ac09d3e 100644 --- a/srcpkgs/libreoffice-i18n/template +++ b/srcpkgs/libreoffice-i18n/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice-i18n' pkgname=libreoffice-i18n version=5.1.2 -revision=1 +revision=2 build_style=meta nocross=yes hostmakedepends="rpmextract" @@ -294,7 +294,7 @@ do_build() { _lang="${_tarbname##*_}" echo "Unpacking ${_tarbname}..." # We create a directory using p_${_lang}, for example p_zh-TW, containing - # opt/libreofficeX.Y/lib/libreoffice, with helppack and/or langpack + # opt/libreofficeX.Y/out, with helppack and/or langpack # extracted inside it. mkdir -p ${wrksrc}/p_${_lang} cd ${wrksrc}/p_${_lang} @@ -304,8 +304,8 @@ do_build() { if [ -d "${wrksrc}/LibreOffice_${_localver}_Linux_x86_rpm_langpack_${_lang}/RPMS/" ]; then rpmextract ${wrksrc}/LibreOffice_${_localver}_Linux_x86_rpm_langpack_${_lang}/RPMS/*.rpm fi - mkdir -p lib/libreoffice - cp -pRv opt/libreoffice${version%.*}/* lib/libreoffice/ + mkdir -p out + cp -pRv opt/libreoffice${version%.*}/* out/ rm -rf opt done } @@ -333,8 +333,8 @@ _pkgtmpl() { depends="libreoffice>=${version}" short_desc="LibreOffice localization files - $2 language pack" pkg_install() { - vmkdir usr/libreoffice${_version} - mv ${wrksrc}/p_${_lang}/lib ${PKGDESTDIR}/usr/libreoffice${_version}/ + vmkdir usr/lib/libreoffice + mv ${wrksrc}/p_${_lang}/out/* ${PKGDESTDIR}/usr/lib/libreoffice/ } }