libreoffice: fix removing ${DESTDIR}/all
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 <pullmoll@t-online.de>
This commit is contained in:
parent
6777b314c1
commit
45a428c95a
1 changed files with 10 additions and 10 deletions
|
@ -544,8 +544,6 @@ post_install() {
|
||||||
sed -i "s/libreoffice5.4/libreoffice/" ${DESTDIR}/usr/lib/libreoffice/share/xdg/*.desktop
|
sed -i "s/libreoffice5.4/libreoffice/" ${DESTDIR}/usr/lib/libreoffice/share/xdg/*.desktop
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
# Remove any remains from not packaged files
|
|
||||||
rm -rf ${DESTDIR}/all
|
|
||||||
}
|
}
|
||||||
|
|
||||||
libreoffice-common_package() {
|
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() {
|
libreoffice-math_package() {
|
||||||
short_desc+=" - Equation editor"
|
short_desc+=" - Equation editor"
|
||||||
depends="libreoffice-common>=${version}_${revision}"
|
depends="libreoffice-common>=${version}_${revision}"
|
||||||
|
@ -625,13 +631,7 @@ libreoffice-writer_package() {
|
||||||
noverifyrdeps=yes
|
noverifyrdeps=yes
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
_split writer
|
_split writer
|
||||||
}
|
# Remove any remains from not packaged files
|
||||||
}
|
rm -rf ${DESTDIR}/all
|
||||||
|
|
||||||
libreoffice-kit_package() {
|
|
||||||
short_desc+=" - development files"
|
|
||||||
pkg_install() {
|
|
||||||
vmkdir usr/include
|
|
||||||
vcopy ${wrksrc}/include/LibreOfficeKit usr/include
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue