solenv/bin/assemble-flatpak.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
New commits: commit 22034278a0955f2857ee1eaccdd2318bd9b9065b Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Feb 9 15:44:16 2018 +0100 Include <release> in Flatpak appdata.xml ...fixing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/13> "No version information". This is only minimal release information (cf. <https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html# tag-releases>), but is what is available directly in the build without additional manual input. Lack of either a date or timestamp attribute causes a failure "org.libreoffice.LibreOffice.desktop: AppData problem: attribute-missing : <release> has no timestamp", so include the current date in ISO 8601 format to silence that. It is assumed that the LIBO_VERSION_* variables will only contain numeric values, so don't need to be encoded when included in an XML attribute. Change-Id: I442a01d5093ab2621897685c3bc1eeda4ee08fa9 (cherry picked from commit 6e004cce495713164778d035e00a39b5465b1c55) Reviewed-on: https://gerrit.libreoffice.org/49589 Reviewed-by: Stephan Bergmann <sberg...@redhat.com> Tested-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh index 3eade815b11b..67cf47bad33d 100755 --- a/solenv/bin/assemble-flatpak.sh +++ b/solenv/bin/assemble-flatpak.sh @@ -43,7 +43,7 @@ done ## doesn't show more than five screenshots anyway, so restrict to one each from ## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base): mkdir /app/share/appdata -cat <<\EOF >/app/share/appdata/org.libreoffice.LibreOffice.appdata.xml +cat <<EOF >/app/share/appdata/org.libreoffice.LibreOffice.appdata.xml <?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> <id>org.libreoffice.LibreOffice.desktop</id> @@ -98,6 +98,11 @@ cat <<\EOF >/app/share/appdata/org.libreoffice.LibreOffice.appdata.xml <kudo>ModernToolkit</kudo> <kudo>UserDocs</kudo> </kudos> + <releases> + <release + version="${LIBO_VERSION_MAJOR?}.${LIBO_VERSION_MINOR?}.${LIBO_VERSION_MICRO?}.${LIBO_VERSION_PATCH?}" + date="$(date +%Y-%m-%d)"/> + </releases> </component> EOF _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits