From f695727d4930542e992cc3d6b82fa7a94d716f10 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 7 Aug 2023 12:33:07 +0200 Subject: [PATCH] Fix flatpak appstream metadata assembling Adapt to upstream changes in solenv/bin/assemble-flatpak-appdata* scripts: Separate step1 and step2 are gone and there is only a single script to generate flatpak appstream metadata now. See https://github.com/LibreOffice/core/commit/48d09aa85e01d881995c660f845b60bd8088e7c0 --- libreoffice.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 4fc426e..25ea7b3 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1475,12 +1475,9 @@ export DESTDIR=%{buildroot} %if 0%{?flatpak} # Assemble the libreoffice-*.appdata.xml files into a single -# org.libreoffice.LibreOffice.appdata.xml; first create the single file: -solenv/bin/assemble-flatpak-appdata-step1.sh \ +# org.libreoffice.LibreOffice.appdata.xml: +solenv/bin/assemble-flatpak-appdata.sh \ %{buildroot}%{_datadir}/metainfo/ 0 -# ...then append the original files to the single file: -solenv/bin/assemble-flatpak-appdata-step2.sh \ - %{buildroot}%{_datadir}/metainfo/ %{buildroot}%{_datadir}/metainfo/ rm %{buildroot}%{_datadir}/metainfo/libreoffice-*.appdata.xml %endif