diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-04-30 16:24:14 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-05-03 10:40:41 +0000 |
| commit | c1b0359b6acc091aa73ab091d1a2a1728dec7a97 (patch) | |
| tree | 5ff09606216f90b24b470afe82f25b0f07fc23e1 /community | |
| parent | e1b4e041f2b2cc5a24d02ab07ff6a4f1b6b9c8ce (diff) | |
| download | aports-c1b0359b6acc091aa73ab091d1a2a1728dec7a97.tar.bz2 aports-c1b0359b6acc091aa73ab091d1a2a1728dec7a97.tar.xz | |
community/libreoffice: move /usr/lib/libreoffice/share/xdg/*.desktop to right subpackage
These shouldn't be in -common when another subpackage actually provides
them.
Diffstat (limited to 'community')
| -rw-r--r-- | community/libreoffice/APKBUILD | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD index 45abe4489d..e433dafd2b 100644 --- a/community/libreoffice/APKBUILD +++ b/community/libreoffice/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libreoffice pkgver=6.4.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="LibreOffice - Meta package for the full office suite" url="https://www.libreoffice.org/" arch="all !s390x !mips !mips64" @@ -92,7 +92,7 @@ makedepends=" zip " # GNU sed is needed for in i18npool/CustomTarget_localedata.mk -subpackages="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw +subpackages="$pkgname-common $pkgname-base $pkgname-calc $pkgname-draw $pkgname-gnome $pkgname-impress $pkgname-math $pkgname-connector-postgres $pkgname-writer $pkgname-sdk $pkgname-sdk-doc:sdk_doc libreofficekit" depends="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw $pkgname-impress $pkgname-math @@ -361,27 +361,42 @@ base() { pkgdesc="LibreOffice - Database frontend" depends="libreoffice-common" _split base + + mkdir -p "$subpkgdir"/usr/lib/libreoffice/share/xdg + mv "$pkgdir"/../all/usr/lib/libreoffice/share/xdg/base.desktop "$subpkgdir"/usr/lib/libreoffice/share/xdg } calc() { pkgdesc="LibreOffice - Spreadsheet" depends="libreoffice-common" _split calc + + mkdir -p "$subpkgdir"/usr/lib/libreoffice/share/xdg + mv "$pkgdir"/../all/usr/lib/libreoffice/share/xdg/calc.desktop "$subpkgdir"/usr/lib/libreoffice/share/xdg } common() { pkgdesc="LibreOffice - Common files" depends="libreoffice-lang-en_us" _split common - paxmark -m \ - "$subpkgdir"/usr/lib/libreoffice/program/soffice.bin \ - "$subpkgdir"/usr/lib/libreoffice/program/unopkg.bin + + # The .desktop files for each app should be in the corrosponding subpackage + mkdir -p "$pkgdir"/../all/usr/lib/libreoffice/share/xdg + mv "$subpkgdir"/usr/lib/libreoffice/share/xdg/ "$pkgdir"/../all/usr/lib/libreoffice/share/ + mkdir -p "$subpkgdir"/usr/lib/libreoffice/share/xdg + mv \ + "$pkgdir"/../all/usr/lib/libreoffice/share/xdg/startcenter.desktop \ + "$pkgdir"/../all/usr/lib/libreoffice/share/xdg/xsltfilter.desktop \ + "$subpkgdir"/usr/lib/libreoffice/share/xdg/ } draw() { pkgdesc="LibreOffice - Drawing application" depends="libreoffice-common" _split draw + + mkdir -p "$subpkgdir"/usr/lib/libreoffice/share/xdg + mv "$pkgdir"/../all/usr/lib/libreoffice/share/xdg/draw.desktop "$subpkgdir"/usr/lib/libreoffice/share/xdg } gnome() { @@ -394,6 +409,9 @@ impress() { pkgdesc="LibreOffice - Presentation application" depends="libreoffice-common" _split impress + + mkdir -p "$subpkgdir"/usr/lib/libreoffice/share/xdg + mv "$pkgdir"/../all/usr/lib/libreoffice/share/xdg/impress.desktop "$subpkgdir"/usr/lib/libreoffice/share/xdg } libreofficekit() { @@ -405,6 +423,9 @@ math() { pkgdesc="LibreOffice - Equation editor" depends="libreoffice-common" _split math + + mkdir -p "$subpkgdir"/usr/lib/libreoffice/share/xdg + mv "$pkgdir"/../all/usr/lib/libreoffice/share/xdg/math.desktop "$subpkgdir"/usr/lib/libreoffice/share/xdg } postgres() { @@ -417,6 +438,9 @@ writer() { pkgdesc="LibreOffice - Word Processor" depends="libreoffice-common" _split writer + + mkdir -p "$subpkgdir"/usr/lib/libreoffice/share/xdg + mv "$pkgdir"/../all/usr/lib/libreoffice/share/xdg/writer.desktop "$subpkgdir"/usr/lib/libreoffice/share/xdg } sdk() { |