From 45a428c95ab216cd4694be27aef823ac820102f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 15 May 2018 16:48:53 +0200 Subject: [PATCH] libreoffice: fix removing ${DESTDIR}/all MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removing the intermediate directory in post_install() was too early. Do it after the last subpackage libreoffice-writer was installed. FIXME: There are obviously some files which are not in any package, namely the fonts. Identify the files and perhaps create additional subpackages which don't rely on libreoffice's file-list/*_list.txt files. Signed-off-by: Jürgen Buchmüller --- srcpkgs/libreoffice/template | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 6e531f3ec93..cadb3418e93 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -544,8 +544,6 @@ post_install() { sed -i "s/libreoffice5.4/libreoffice/" ${DESTDIR}/usr/lib/libreoffice/share/xdg/*.desktop ;; esac - # Remove any remains from not packaged files - rm -rf ${DESTDIR}/all } libreoffice-common_package() { @@ -601,6 +599,14 @@ libreoffice-impress_package() { } } +libreoffice-kit_package() { + short_desc+=" - development files" + pkg_install() { + vmkdir usr/include + vcopy ${wrksrc}/include/LibreOfficeKit usr/include + } +} + libreoffice-math_package() { short_desc+=" - Equation editor" depends="libreoffice-common>=${version}_${revision}" @@ -625,13 +631,7 @@ libreoffice-writer_package() { noverifyrdeps=yes pkg_install() { _split writer - } -} - -libreoffice-kit_package() { - short_desc+=" - development files" - pkg_install() { - vmkdir usr/include - vcopy ${wrksrc}/include/LibreOfficeKit usr/include + # Remove any remains from not packaged files + rm -rf ${DESTDIR}/all } }