#17 Fix flatpak appstream metadata assembling
Merged 9 months ago by kalev. Opened 9 months ago by kalev.
rpms/ kalev/libreoffice assemble-flatpak-appdata-changes  into  rawhide

file modified
+2 -5
@@ -1475,12 +1475,9 @@ 

  

  %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

  

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

@sbergmann Does this look right to you?

I wouldn't have dropped the trailing colon from the comment, but generally LGTM.

rebased onto f695727

9 months ago

Thanks! I fixed the trailing colon.

Pull-Request has been merged by kalev

9 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/b2c953eb300547c3b54cf25e16430eb1

Metadata