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 /sysui/desktop | |
| 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 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/freedesktop/freedesktop-menus.spec | 2 | ||||
| -rwxr-xr-x | sysui/desktop/share/create_tree.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index e6e713d42887..d4858842b8e9 100644 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -391,5 +391,5 @@ fi /usr/share/icons/hicolor/*/apps/*png /usr/share/icons/hicolor/*/apps/*svg /usr/share/icons/hicolor/*/mimetypes/*png +/usr/share/metainfo/* /usr/share/mime/packages/* -/usr/share/appdata/* diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 6b94395aac26..ce6475cd5ca5 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -56,9 +56,9 @@ for i in `cat launcherlist`; do ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}" done -mkdir -p "${DESTDIR}/${PREFIXDIR}/share/appdata" +mkdir -p "${DESTDIR}/${PREFIXDIR}/share/metainfo" for i in base calc draw impress writer; do - cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml" + cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/metainfo/${PREFIX}-${i}.appdata.xml" done -cp "${APPDATA_SOURCE_DIR}/org.libreoffice.kde.metainfo.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/org.${PREFIX}.kde.metainfo.xml" +cp "${APPDATA_SOURCE_DIR}/org.libreoffice.kde.metainfo.xml" "${DESTDIR}/${PREFIXDIR}/share/metainfo/org.${PREFIX}.kde.metainfo.xml" |