From 3f1371c7a811cb10125f92ff2ab2c4ea6ab1745a Mon Sep 17 00:00:00 2001
From: lleyton <lleyton@fyralabs.com>
Date: Tue, 22 Nov 2022 20:30:41 -0800
Subject: [PATCH] Use non gnome specific appstream validate

---
 .../elementary/elementary-calculator/elementary-calculator.spec | 2 +-
 .../elementary/elementary-calendar/elementary-calendar.spec     | 2 +-
 .../elementary/elementary-camera/elementary-camera.spec         | 2 +-
 .../elementary-capnet-assist/elementary-capnet-assist.spec      | 2 +-
 anda/desktops/elementary/elementary-code/elementary-code.spec   | 2 +-
 anda/desktops/elementary/elementary-files/elementary-files.spec | 2 +-
 .../elementary/elementary-greeter/elementary-greeter.spec       | 2 +-
 .../elementary/elementary-icon-theme/elementary-icon-theme.spec | 2 +-
 anda/desktops/elementary/elementary-music/elementary-music.spec | 2 +-
 .../elementary/elementary-onboarding/elementary-onboarding.spec | 2 +-
 .../elementary/elementary-photos/elementary-photos.spec         | 2 +-
 .../elementary-screenshot-tool/elementary-screenshot-tool.spec  | 2 +-
 .../elementary-settings-daemon/elementary-settings-daemon.spec  | 2 +-
 .../elementary-shortcut-overlay.spec                            | 2 +-
 anda/desktops/elementary/elementary-tasks/elementary-tasks.spec | 2 +-
 .../elementary/elementary-terminal/elementary-terminal.spec     | 2 +-
 anda/desktops/elementary/elementary-theme/elementary-theme.spec | 2 +-
 .../elementary/elementary-videos/elementary-videos.spec         | 2 +-
 anda/desktops/elementary/gala/gala.spec                         | 2 +-
 anda/desktops/elementary/granite-7/granite-7.spec               | 2 +-
 .../pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec        | 2 +-
 .../elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec | 2 +-
 anda/desktops/elementary/plank/plank.spec                       | 2 +-
 .../elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec | 2 +-
 .../switchboard-plug-about/switchboard-plug-about.spec          | 2 +-
 .../switchboard-plug-applications.spec                          | 2 +-
 .../switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec  | 2 +-
 .../switchboard-plug-display/switchboard-plug-display.spec      | 2 +-
 .../switchboard-plug-keyboard/switchboard-plug-keyboard.spec    | 2 +-
 .../switchboard-plug-mouse-touchpad.spec                        | 2 +-
 .../switchboard-plug-networking.spec                            | 2 +-
 .../switchboard-plug-notifications.spec                         | 2 +-
 .../switchboard-plug-onlineaccounts.spec                        | 2 +-
 .../switchboard-plug-pantheon-shell.spec                        | 2 +-
 .../switchboard-plug-printers/switchboard-plug-printers.spec    | 2 +-
 .../switchboard-plug-sharing/switchboard-plug-sharing.spec      | 2 +-
 .../switchboard-plug-sound/switchboard-plug-sound.spec          | 2 +-
 .../switchboard-plug-tweaks/switchboard-plug-tweaks.spec        | 2 +-
 anda/desktops/elementary/switchboard/switchboard.spec           | 2 +-
 .../wingpanel-applications-menu.spec                            | 2 +-
 .../wingpanel-indicator-bluetooth.spec                          | 2 +-
 .../wingpanel-indicator-datetime.spec                           | 2 +-
 .../wingpanel-indicator-keyboard.spec                           | 2 +-
 .../wingpanel-indicator-network.spec                            | 2 +-
 .../wingpanel-indicator-nightlight.spec                         | 2 +-
 .../wingpanel-indicator-notifications.spec                      | 2 +-
 .../wingpanel-indicator-power/wingpanel-indicator-power.spec    | 2 +-
 .../wingpanel-indicator-session.spec                            | 2 +-
 .../wingpanel-indicator-sound/wingpanel-indicator-sound.spec    | 2 +-
 anda/desktops/elementary/wingpanel/wingpanel.spec               | 2 +-
 anda/games/prismlauncher-nightly/prismlauncher-nightly.spec     | 2 +-
 .../prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec    | 2 +-
 anda/games/prismlauncher-qt5/prismlauncher-qt5.spec             | 2 +-
 anda/games/prismlauncher/prismlauncher.spec                     | 2 +-
 54 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec
index 6a10134bd6..0604cec1f6 100644
--- a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec
+++ b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec
@@ -52,7 +52,7 @@ functions (sin, cos, and tan).
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec
index 9caed3b7fe..bc3bb29649 100644
--- a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec
+++ b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec
@@ -70,7 +70,7 @@ desktop-file-validate \
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-camera/elementary-camera.spec b/anda/desktops/elementary/elementary-camera/elementary-camera.spec
index 6167be6bef..d3ce859a59 100644
--- a/anda/desktops/elementary/elementary-camera/elementary-camera.spec
+++ b/anda/desktops/elementary/elementary-camera/elementary-camera.spec
@@ -51,7 +51,7 @@ Camera is a simple app to take photos with a webcam.
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec b/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec
index e4ab326239..623c961d8c 100644
--- a/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec
+++ b/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec
@@ -59,7 +59,7 @@ Written in Vala and using WebkitGtk+.
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-code/elementary-code.spec b/anda/desktops/elementary/elementary-code/elementary-code.spec
index 7a4f1f786e..d85df54cef 100644
--- a/anda/desktops/elementary/elementary-code/elementary-code.spec
+++ b/anda/desktops/elementary/elementary-code/elementary-code.spec
@@ -73,7 +73,7 @@ This package contains the development headers.
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-files/elementary-files.spec b/anda/desktops/elementary/elementary-files/elementary-files.spec
index b8f681fd99..811a28fe1d 100644
--- a/anda/desktops/elementary/elementary-files/elementary-files.spec
+++ b/anda/desktops/elementary/elementary-files/elementary-files.spec
@@ -97,7 +97,7 @@ cp -pav %{SOURCE2} %{buildroot}/%{_datadir}/contractor/
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec
index 0751b5f049..a845a28583 100644
--- a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec
+++ b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec
@@ -86,7 +86,7 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec b/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec
index ec587948b0..cc6d58769c 100644
--- a/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec
+++ b/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec
@@ -68,7 +68,7 @@ touch %{buildroot}/%{_datadir}/icons/elementary/icon-theme.cache
 
 %check
 # ignore validation until appstream-glib knows the "icon-theme" component type
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml || :
 
 
diff --git a/anda/desktops/elementary/elementary-music/elementary-music.spec b/anda/desktops/elementary/elementary-music/elementary-music.spec
index 3a6b06a65e..bf103f94f5 100644
--- a/anda/desktops/elementary/elementary-music/elementary-music.spec
+++ b/anda/desktops/elementary/elementary-music/elementary-music.spec
@@ -82,7 +82,7 @@ This package contains files needed for developing with Music.
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec
index 8a4301b3c7..b566f2f67b 100644
--- a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec
+++ b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec
@@ -61,7 +61,7 @@ desktop-file-validate \
 desktop-file-validate \
     %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-photos/elementary-photos.spec b/anda/desktops/elementary/elementary-photos/elementary-photos.spec
index 8c222db626..2a917d0e61 100644
--- a/anda/desktops/elementary/elementary-photos/elementary-photos.spec
+++ b/anda/desktops/elementary/elementary-photos/elementary-photos.spec
@@ -73,7 +73,7 @@ desktop-file-validate \
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}-viewer.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec b/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec
index 3c64807cb4..5863d6f250 100644
--- a/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec
+++ b/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec
@@ -50,7 +50,7 @@ Screenshot tool designed for elementary.
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec b/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec
index 661729ad0d..31f1670db4 100644
--- a/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec
+++ b/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec
@@ -49,7 +49,7 @@ Requires:       xdg-desktop-portal
 desktop-file-validate \
     %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec b/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec
index ce3bb6c8bb..ad3fdc858c 100644
--- a/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec
+++ b/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec
@@ -48,7 +48,7 @@ the titlebar opens the system keyboard settings.
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec b/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec
index efdc53e30a..b39c30865e 100644
--- a/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec
+++ b/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec
@@ -60,7 +60,7 @@ desktop-file-validate \
 desktop-file-validate \
     %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec
index 1de5dad757..2e619cea3c 100644
--- a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec
+++ b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec
@@ -76,7 +76,7 @@ desktop-file-validate \
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/open-pantheon-terminal-here.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-theme/elementary-theme.spec b/anda/desktops/elementary/elementary-theme/elementary-theme.spec
index 253d450cf1..e975d64c78 100644
--- a/anda/desktops/elementary/elementary-theme/elementary-theme.spec
+++ b/anda/desktops/elementary/elementary-theme/elementary-theme.spec
@@ -56,7 +56,7 @@ This package contains the plank theme.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/elementary-videos/elementary-videos.spec b/anda/desktops/elementary/elementary-videos/elementary-videos.spec
index 893ce7c91c..5b8130d14d 100644
--- a/anda/desktops/elementary/elementary-videos/elementary-videos.spec
+++ b/anda/desktops/elementary/elementary-videos/elementary-videos.spec
@@ -55,7 +55,7 @@ to the desktop.
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/gala/gala.spec b/anda/desktops/elementary/gala/gala.spec
index 987ffa0634..206634a241 100644
--- a/anda/desktops/elementary/gala/gala.spec
+++ b/anda/desktops/elementary/gala/gala.spec
@@ -91,7 +91,7 @@ desktop-file-validate \
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/gala*.desktop
 
-#appstream-util validate-relax --nonet \
+#appstreamcli validate --nonet \
 #    %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/granite-7/granite-7.spec b/anda/desktops/elementary/granite-7/granite-7.spec
index 77da59b086..6b92415262 100644
--- a/anda/desktops/elementary/granite-7/granite-7.spec
+++ b/anda/desktops/elementary/granite-7/granite-7.spec
@@ -63,7 +63,7 @@ This package contains the development headers.
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/io.elementary.granite-7.demo.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/granite-7.appdata.xml
 
 
diff --git a/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec b/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec
index 3d730c0623..8ff52d1ff3 100644
--- a/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec
+++ b/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec
@@ -47,7 +47,7 @@ requests access to location services.
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec b/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec
index ed6dcff3d9..6c5a62a612 100644
--- a/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec
+++ b/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec
@@ -48,7 +48,7 @@ desktop-file-validate \
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/plank/plank.spec b/anda/desktops/elementary/plank/plank.spec
index 7b86c5dc18..216771409d 100644
--- a/anda/desktops/elementary/plank/plank.spec
+++ b/anda/desktops/elementary/plank/plank.spec
@@ -107,7 +107,7 @@ desktop-file-validate \
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec b/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec
index d7749ffcd9..32613d6760 100644
--- a/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec
+++ b/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec
@@ -53,7 +53,7 @@ that allows the user to manage accessibility settings.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec b/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec
index 0602e8c607..a4fcf7e796 100644
--- a/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec
+++ b/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec
@@ -59,7 +59,7 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.app
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec b/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec
index 925d2494e6..22df0b84d0 100644
--- a/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec
+++ b/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec
@@ -53,7 +53,7 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.app
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec b/anda/desktops/elementary/switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec
index afb390ecbe..8b4a9ca9db 100644
--- a/anda/desktops/elementary/switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec
+++ b/anda/desktops/elementary/switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec
@@ -55,7 +55,7 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.app
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec b/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec
index 56e5e5615e..a1fa43b134 100644
--- a/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec
+++ b/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec
@@ -50,7 +50,7 @@ them.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec
index 4946989f5f..5028eb64cd 100644
--- a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec
+++ b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec
@@ -57,7 +57,7 @@ same time. Keyboard shortcuts are also part of this plug.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-mouse-touchpad/switchboard-plug-mouse-touchpad.spec b/anda/desktops/elementary/switchboard-plug-mouse-touchpad/switchboard-plug-mouse-touchpad.spec
index bc31a490a3..a0be895e5b 100644
--- a/anda/desktops/elementary/switchboard-plug-mouse-touchpad/switchboard-plug-mouse-touchpad.spec
+++ b/anda/desktops/elementary/switchboard-plug-mouse-touchpad/switchboard-plug-mouse-touchpad.spec
@@ -49,7 +49,7 @@ A switchboard plug to configure the behavior of mice and touchpads.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec b/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec
index 35815450d9..f27576c0a2 100644
--- a/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec
+++ b/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec
@@ -55,7 +55,7 @@ A switchboard plug for configuring available networks.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec b/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec
index e80dd14b02..356b1dbb73 100644
--- a/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec
+++ b/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec
@@ -53,7 +53,7 @@ related to the Notifications plugin for Gala.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec
index 4a8daf6f8c..3e4a21819e 100644
--- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec
+++ b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec
@@ -58,7 +58,7 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.app
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec b/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec
index abf8415f8f..2080c2b12d 100644
--- a/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec
+++ b/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec
@@ -62,7 +62,7 @@ desktop settings such as the panel, app launcher, and window manager.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec b/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec
index d1a6cfc636..fa9e9a04b3 100644
--- a/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec
+++ b/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec
@@ -52,7 +52,7 @@ A printers plug for Switchboard.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-sharing/switchboard-plug-sharing.spec b/anda/desktops/elementary/switchboard-plug-sharing/switchboard-plug-sharing.spec
index 78e4ca0f38..9b14965ca5 100644
--- a/anda/desktops/elementary/switchboard-plug-sharing/switchboard-plug-sharing.spec
+++ b/anda/desktops/elementary/switchboard-plug-sharing/switchboard-plug-sharing.spec
@@ -50,7 +50,7 @@ Configure the sharing of system services.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec b/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec
index 6866240a5a..46bcb1478b 100644
--- a/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec
+++ b/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec
@@ -55,7 +55,7 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.app
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec b/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec
index 8241f16f38..6a77ab0424 100644
--- a/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec
+++ b/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec
@@ -69,7 +69,7 @@ de trabalho.
 sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_name}.appdata.xml
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{plug_name}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec
index 4979dfd555..eb43ae1636 100644
--- a/anda/desktops/elementary/switchboard/switchboard.spec
+++ b/anda/desktops/elementary/switchboard/switchboard.spec
@@ -77,7 +77,7 @@ mkdir -p %{buildroot}/%{_libdir}/%{name}/system
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec b/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec
index 43738f115c..42b2d3d6eb 100644
--- a/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec
+++ b/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec
@@ -56,7 +56,7 @@ The lightweight and stylish app launcher from elementary.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec b/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec
index 859b80a1cd..47637d07ba 100644
--- a/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec
@@ -52,7 +52,7 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appda
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec b/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec
index 18d9212d89..fcd3fc4862 100644
--- a/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec
@@ -52,7 +52,7 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appda
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec b/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec
index 35f7b92220..8d97266446 100644
--- a/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec
@@ -49,7 +49,7 @@ A keyboard indicator for wingpanel.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec b/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec
index 990a16be9f..fe2a5ea709 100644
--- a/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec
@@ -50,7 +50,7 @@ A network indicator for wingpanel.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec b/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec
index bf59558de6..2f450d0154 100644
--- a/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec
@@ -47,7 +47,7 @@ A wingpanel indicator for Night Light.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec b/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec
index 04c2d3e26f..b091bd1781 100644
--- a/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec
@@ -50,7 +50,7 @@ A notifications indicator for wingpanel.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec b/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec
index 6b842c5b75..744d49b2c7 100644
--- a/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec
@@ -53,7 +53,7 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appda
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec b/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec
index c5e8d6cd07..2ab583a635 100644
--- a/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec
@@ -48,7 +48,7 @@ A session Indicator for wingpanel.
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec b/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec
index 5ceea6b0e5..e72543c14e 100644
--- a/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec
@@ -53,7 +53,7 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appda
 
 
 %check
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/desktops/elementary/wingpanel/wingpanel.spec b/anda/desktops/elementary/wingpanel/wingpanel.spec
index d84dfc750d..b8a4d049fb 100644
--- a/anda/desktops/elementary/wingpanel/wingpanel.spec
+++ b/anda/desktops/elementary/wingpanel/wingpanel.spec
@@ -85,7 +85,7 @@ desktop-file-validate \
 desktop-file-validate \
     %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
index 9b155812ac..d85385dd19 100644
--- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
+++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
@@ -164,7 +164,7 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %cmake_install
 
 %if 0%{?suse_version} > 1500 || 0%{?fedora} > 35
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml
 %endif
 
diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec
index e1a697dfd9..42f9fc27f3 100644
--- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec
+++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec
@@ -164,7 +164,7 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %cmake_install
 
 %if 0%{?suse_version} > 1500 || 0%{?fedora} > 35
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml
 %endif
 
diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec
index 61b4a3e887..f5956bceb3 100644
--- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec
+++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec
@@ -144,7 +144,7 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %cmake_install
 
 %if 0%{?suse_version} > 1500 || 0%{?fedora} > 35
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml
 %endif
 
diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec
index fcaaa79365..c06375b9dd 100644
--- a/anda/games/prismlauncher/prismlauncher.spec
+++ b/anda/games/prismlauncher/prismlauncher.spec
@@ -144,7 +144,7 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %cmake_install
 
 %if 0%{?suse_version} > 1500 || 0%{?fedora} > 35
-appstream-util validate-relax --nonet \
+appstreamcli validate --nonet \
     %{buildroot}%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml
 %endif