solenv/bin/assemble-flatpak-appdata-step1.sh | 2 +-
solenv/bin/assemble-flatpak.sh | 2 +-
sysui/desktop/freedesktop/freedesktop-menus.spec | 2 +-
sysui/desktop/share/create_tree.sh | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e98c4be2c87ba5b3f4aedc31388014b320588d4b
Author: Chris Mayo <aklh...@gmail.com>
AuthorDate: Tue Nov 17 19:24:44 2020 +0000
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Wed Dec 23 18:19:46 2020 +0100
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.st...@cib.de>
(cherry picked from commit 4cd4726e9d97e9785140c809d2154357d5d15837)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108180
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/
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"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
