From 4cd4726e9d97e9785140c809d2154357d5d15837 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Tue, 17 Nov 2020 19:24:44 +0000 Subject: 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 --- sysui/desktop/freedesktop/freedesktop-menus.spec | 2 +- sysui/desktop/share/create_tree.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sysui') 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" -- cgit