diff options
author | Chris Mayo <aklhfex@gmail.com> | 2020-11-17 19:24:44 +0000 |
---|---|---|
committer | Michael Stahl <michael.stahl@cib.de> | 2020-12-23 18:19:46 +0100 |
commit | e98c4be2c87ba5b3f4aedc31388014b320588d4b (patch) | |
tree | 24866192c24c85d794da1967efa6cc0869fa4b26 /solenv | |
parent | f00fbd068a3b98b4c2ab98aea01ed6a2ff1b8009 (diff) |
tdf#135504: Install application metadata in /usr/share/metainfo
Current path /usr/share/appdata is deprecated [1].
[1] https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location
Change-Id: Ibd837240ad329c005a840f9ae2e0f4f13f139b59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106025
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 4cd4726e9d97e9785140c809d2154357d5d15837)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108180
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/assemble-flatpak-appdata-step1.sh | 2 | ||||
-rwxr-xr-x | solenv/bin/assemble-flatpak.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/assemble-flatpak-appdata-step1.sh b/solenv/bin/assemble-flatpak-appdata-step1.sh index 4658dd45d018..4896cf3f20bc 100755 --- a/solenv/bin/assemble-flatpak-appdata-step1.sh +++ b/solenv/bin/assemble-flatpak-appdata-step1.sh @@ -19,7 +19,7 @@ set -e ## org.libreoffice.LibreOffice.appdata.xml is manually derived from the various -## inst/share/appdata/libreoffice-*.appdata.xml (at least recent GNOME Software +## inst/share/metainfo/libreoffice-*.appdata.xml (at least recent GNOME Software ## doesn't show more than five screenshots anyway, so restrict to one each from ## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base): cat <<\EOF >"${1?}"org.libreoffice.LibreOffice.appdata.xml diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh index 8ca5bcf08c41..9991a0d0d71c 100755 --- a/solenv/bin/assemble-flatpak.sh +++ b/solenv/bin/assemble-flatpak.sh @@ -63,7 +63,7 @@ done mkdir -p /app/share/appdata "${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step1.sh /app/share/appdata/ 1 -"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh "${PREFIXDIR?}"/share/appdata/ \ +"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh "${PREFIXDIR?}"/share/metainfo/ \ /app/share/appdata/ ## see <https://github.com/flatpak/flatpak/blob/master/app/ |