#8 Fix AppStream metadata
Merged 2 years ago by nonamedotc. Opened 2 years ago by asciiwolf.
Unknown source rawhide  into  rawhide

@@ -0,0 +1,23 @@

+ <?xml version="1.0" encoding="UTF-8"?>

+ <component type="desktop-application">

+   <id>com.nextcloud.desktopclient.nextcloud</id>

+   <name>Nextcloud Desktop</name>

+   <project_license>GPL-2.0+</project_license>

+   <summary>Nextcloud desktop synchronization client</summary>

+   <metadata_license>CC0-1.0</metadata_license>

+   <description>

+     <p>The Nextcloud desktop client allows you to keep one or more folders full of

+ your photos, videos and documents synchronized with your server. Any file you

+ add, modify or delete in the synced folders on your desktop or laptop will show

+ up, change or disappear on the server and all other connected devices. Thanks

+ to the client, you can work with your files even when you are not online!</p>

+   </description>

+   <screenshots>

+     <screenshot type="default">

+       <caption>The options dialog</caption>

+       <image>https://nextcloud.com/wp-content/uploads/2022/04/linux.png</image>

+     </screenshot>

+   </screenshots>

+   <url type="homepage">https://nextcloud.com</url>

+   <content_rating type="oars-1.1"/>

+ </component>

file modified
+5 -5
@@ -12,7 +12,7 @@

  License:        LGPLv2+ and GPLv2

  Url:            https://nextcloud.com/install/#install-clients

  Source0:        https://github.com/nextcloud/desktop/archive/v%{version}/desktop-%{version}.tar.gz

- Source1:        nextcloud.appdata.xml

+ Source1:        com.nextcloud.desktopclient.nextcloud.metainfo.xml

  # Patch0: fixes GNOME quirks on Wayland sessions. Read

  # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/3BVLBS4B3XHJEXFVGD7RK2ZMXZG6JQZT/

  Patch0: xcb_%{version}.patch
@@ -166,8 +166,8 @@

  %cmake_install

  

  %find_lang client --with-qt

- mkdir -p %{buildroot}%{_datadir}/appdata/

- install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml

+ mkdir -p %{buildroot}%{_datadir}/metainfo/

+ install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/com.nextcloud.desktopclient.nextcloud.metainfo.xml

  

  

  # for distros that do not have KDE Plasma 5
@@ -188,7 +188,7 @@

  

  

  %check

- appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml

+ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/com.nextcloud.desktopclient.nextcloud.metainfo.xml

  

  %ldconfig_scriptlets libs

  
@@ -202,7 +202,7 @@

  %{_datadir}/mime/packages/nextcloud.xml

  %{_datadir}/applications/com.nextcloud.desktopclient.nextcloud.desktop

  %{_datadir}/icons/hicolor/*/apps/*

- %{_datadir}/appdata/nextcloud.appdata.xml

+ %{_datadir}/metainfo/com.nextcloud.desktopclient.nextcloud.metainfo.xml

  %{_datadir}/cloud-providers/com.nextcloudgmbh.Nextcloud.ini

  %{_datadir}/dbus-1/services/com.nextcloudgmbh.Nextcloud.service

  

file removed
-16
@@ -1,16 +0,0 @@

- <?xml version="1.0" encoding="UTF-8"?>

- <application>

-  <id type="desktop">nextcloud.desktop</id>

-  <licence>CC0</licence>

-  <name>Nextcloud Desktop Client</name>

-  <summary>The Nextcloud desktop client, lets you sync directly to your Nextcloud server</summary>

-  <description>

-   <p>

-     Nextcloud-client enables you to connect to your private Nextcloud Server. With it you can create folders in your home directory, and keep the contents of those folders synced with your Nextcloud server. Simply copy a file into   the directory and the Nextcloud Client does the rest.

-   </p>

-  </description>

-  <screenshots>

-   <screenshot type="default" width="713" height="501">https://comzeradd.fedorapeople.org/screenshots/owncloud1.jpg</screenshot>

-  </screenshots>

-  <url type="homepage">https://nextcloud.org/</url>

- </application>

Use the AppStream metadata file from Flathub.

See this comment for more info: https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1826#note_1502316
+ The currently used AppStream metadata file has incorrect app id and other problems.

Thanks for the PR. Merged.

Pull-Request has been merged by nonamedotc

2 years ago