From 8aaa2027e655305ed48a13e458ece05ac1f84d28 Mon Sep 17 00:00:00 2001
From: lleyton <lleyton@fyralabs.com>
Date: Tue, 22 Nov 2022 20:43:13 -0800
Subject: [PATCH] Require appstreamcli

---
 .../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-notifications/elementary-notifications.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 +-
 55 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec
index 0604cec1f6..db5394d0e9 100644
--- a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec
+++ b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson >= 0.49
 BuildRequires:  vala
 
diff --git a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec
index bc3bb29649..58a84ca437 100644
--- a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec
+++ b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec
@@ -14,7 +14,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  pkgconfig(champlain-0.12)
 BuildRequires:  pkgconfig(champlain-gtk-0.12)
 BuildRequires:  pkgconfig(clutter-1.0)
diff --git a/anda/desktops/elementary/elementary-camera/elementary-camera.spec b/anda/desktops/elementary/elementary-camera/elementary-camera.spec
index d3ce859a59..aa20dfb57e 100644
--- a/anda/desktops/elementary/elementary-camera/elementary-camera.spec
+++ b/anda/desktops/elementary/elementary-camera/elementary-camera.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson >= 0.46
 BuildRequires:  vala
 
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 623c961d8c..c758d72959 100644
--- a/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec
+++ b/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
diff --git a/anda/desktops/elementary/elementary-code/elementary-code.spec b/anda/desktops/elementary/elementary-code/elementary-code.spec
index d85df54cef..221c1580b4 100644
--- a/anda/desktops/elementary/elementary-code/elementary-code.spec
+++ b/anda/desktops/elementary/elementary-code/elementary-code.spec
@@ -14,7 +14,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
diff --git a/anda/desktops/elementary/elementary-files/elementary-files.spec b/anda/desktops/elementary/elementary-files/elementary-files.spec
index 811a28fe1d..bfeb461fc5 100644
--- a/anda/desktops/elementary/elementary-files/elementary-files.spec
+++ b/anda/desktops/elementary/elementary-files/elementary-files.spec
@@ -18,7 +18,7 @@ Source2:        file-roller-extract-here.contract
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson >= 0.50.0
 BuildRequires:  vala >= 0.48.2
 
diff --git a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec
index a845a28583..7967a9115d 100644
--- a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec
+++ b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec
@@ -13,7 +13,7 @@ Source1:        40-%{appname}.conf
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
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 cc6d58769c..7797dc74ed 100644
--- a/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec
+++ b/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec
@@ -13,7 +13,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildArch:      noarch
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 # /usr/bin/rsvg-convert
 BuildRequires:  librsvg2-tools
 BuildRequires:  meson
diff --git a/anda/desktops/elementary/elementary-music/elementary-music.spec b/anda/desktops/elementary/elementary-music/elementary-music.spec
index bf103f94f5..6eed6163b7 100644
--- a/anda/desktops/elementary/elementary-music/elementary-music.spec
+++ b/anda/desktops/elementary/elementary-music/elementary-music.spec
@@ -21,7 +21,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  meson
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  vala >= 0.26
 
 BuildRequires:  pkgconfig(gee-0.8)
diff --git a/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec b/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec
index 33348b8bea..7030dd790e 100644
--- a/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec
+++ b/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec
@@ -13,7 +13,7 @@ Source0:        %{url}/archive/refs/tags/%{version}.tar.gz
 
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  libcanberra-devel
 BuildRequires:  libcanberra-gtk3
 BuildRequires:  pkgconfig(granite) >= 6.0.0
diff --git a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec
index b566f2f67b..39c57d71ac 100644
--- a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec
+++ b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec
@@ -16,7 +16,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
diff --git a/anda/desktops/elementary/elementary-photos/elementary-photos.spec b/anda/desktops/elementary/elementary-photos/elementary-photos.spec
index 2a917d0e61..5e3001f58a 100644
--- a/anda/desktops/elementary/elementary-photos/elementary-photos.spec
+++ b/anda/desktops/elementary/elementary-photos/elementary-photos.spec
@@ -14,7 +14,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
 
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 5863d6f250..296b56c3cd 100644
--- a/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec
+++ b/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec
@@ -15,7 +15,7 @@ Patch1:         0001-meson-remove-deprecated-positional-arguments-from-i1.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson >= 0.46
 BuildRequires:  vala >= 0.24
 
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 31f1670db4..eb5da1a984 100644
--- a/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec
+++ b/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec
@@ -13,7 +13,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  vala
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 ad3fdc858c..b8d466c760 100644
--- a/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec
+++ b/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
diff --git a/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec b/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec
index b39c30865e..9f54021702 100644
--- a/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec
+++ b/anda/desktops/elementary/elementary-tasks/elementary-tasks.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson >= 0.49
 BuildRequires:  vala
 
diff --git a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec
index 2e619cea3c..f6349dd4bc 100644
--- a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec
+++ b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec
@@ -15,7 +15,7 @@ Patch0:         00-drop-upstream-tests.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.40.0
 
diff --git a/anda/desktops/elementary/elementary-theme/elementary-theme.spec b/anda/desktops/elementary/elementary-theme/elementary-theme.spec
index e975d64c78..1f8e394b1a 100644
--- a/anda/desktops/elementary/elementary-theme/elementary-theme.spec
+++ b/anda/desktops/elementary/elementary-theme/elementary-theme.spec
@@ -13,7 +13,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildArch:      noarch
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  sassc
 
diff --git a/anda/desktops/elementary/elementary-videos/elementary-videos.spec b/anda/desktops/elementary/elementary-videos/elementary-videos.spec
index 5b8130d14d..b86703a642 100644
--- a/anda/desktops/elementary/elementary-videos/elementary-videos.spec
+++ b/anda/desktops/elementary/elementary-videos/elementary-videos.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
diff --git a/anda/desktops/elementary/gala/gala.spec b/anda/desktops/elementary/gala/gala.spec
index 206634a241..d2136d336c 100644
--- a/anda/desktops/elementary/gala/gala.spec
+++ b/anda/desktops/elementary/gala/gala.spec
@@ -14,7 +14,7 @@ Patch0:         0000-Modify-default-settings-for-Fedora.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson >= 0.50.0
 BuildRequires:  vala >= 0.28.0
 
diff --git a/anda/desktops/elementary/granite-7/granite-7.spec b/anda/desktops/elementary/granite-7/granite-7.spec
index 6b92415262..b1a63ba5b8 100644
--- a/anda/desktops/elementary/granite-7/granite-7.spec
+++ b/anda/desktops/elementary/granite-7/granite-7.spec
@@ -14,7 +14,7 @@ Source0:        %{url}/archive/%{version}/granite-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson >= 0.48.2
 BuildRequires:  vala >= 0.48
 
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 8ff52d1ff3..b0f6a49bc0 100644
--- a/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec
+++ b/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.34.1
 
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 6c5a62a612..76d192e23f 100644
--- a/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec
+++ b/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.34.1
 
diff --git a/anda/desktops/elementary/plank/plank.spec b/anda/desktops/elementary/plank/plank.spec
index 216771409d..fe4c9083e4 100644
--- a/anda/desktops/elementary/plank/plank.spec
+++ b/anda/desktops/elementary/plank/plank.spec
@@ -29,7 +29,7 @@ Source0:        https://github.com/elementary/dock/archive/%{commit}/dock-%{shor
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  help2man
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
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 32613d6760..ff7ee9f540 100644
--- a/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec
+++ b/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-a11y
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
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 a4fcf7e796..58f8fb4bdc 100644
--- a/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec
+++ b/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-about
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 22df0b84d0..fdfc36fffb 100644
--- a/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec
+++ b/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-applications
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 8b4a9ca9db..254247db37 100644
--- a/anda/desktops/elementary/switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec
+++ b/anda/desktops/elementary/switchboard-plug-bluetooth/switchboard-plug-bluetooth.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-bluetooth
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 a1fa43b134..1845bd2e0c 100644
--- a/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec
+++ b/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-display
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 5028eb64cd..77bf76d509 100644
--- a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec
+++ b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-keyboard
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 a0be895e5b..6e1da14a0c 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
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-mouse-touchpad
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 f27576c0a2..28bcdf1fa1 100644
--- a/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec
+++ b/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-network
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 356b1dbb73..69c2e13f11 100644
--- a/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec
+++ b/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-notifications
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 3e4a21819e..2d0b1a9ffa 100644
--- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec
+++ b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec
@@ -14,7 +14,7 @@ URL:            https://github.com/elementary/switchboard-plug-onlineaccounts
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
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 2080c2b12d..be52561dc1 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
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-pantheon-shell
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 fa9e9a04b3..9ee32e637b 100644
--- a/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec
+++ b/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-printers
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 9b14965ca5..2fca5d6f51 100644
--- a/anda/desktops/elementary/switchboard-plug-sharing/switchboard-plug-sharing.spec
+++ b/anda/desktops/elementary/switchboard-plug-sharing/switchboard-plug-sharing.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-sharing
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 46bcb1478b..fc677dc0b4 100644
--- a/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec
+++ b/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec
@@ -16,7 +16,7 @@ URL:            https://github.com/elementary/switchboard-plug-sound
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.34.1
 
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 6a77ab0424..8f19fff709 100644
--- a/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec
+++ b/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec
@@ -14,7 +14,7 @@ Source0:        %{url}/archive/%{version}/%{plug_name}-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec
index eb43ae1636..d3fccd75b2 100644
--- a/anda/desktops/elementary/switchboard/switchboard.spec
+++ b/anda/desktops/elementary/switchboard/switchboard.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala
 
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 42b2d3d6eb..ad37590f0d 100644
--- a/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec
+++ b/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec
@@ -13,7 +13,7 @@ URL:            https://github.com/elementary/applications-menu
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.32.1
 
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 47637d07ba..d80f57308e 100644
--- a/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec
@@ -13,7 +13,7 @@ URL:            https://github.com/elementary/%{name}
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 fcd3fc4862..191b043335 100644
--- a/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec
@@ -13,7 +13,7 @@ URL:            https://github.com/elementary/wingpanel-indicator-datetime
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 8d97266446..43239e3483 100644
--- a/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec
@@ -13,7 +13,7 @@ URL:            https://github.com/elementary/%{name}
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 fe2a5ea709..88a921dbaa 100644
--- a/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec
@@ -13,7 +13,7 @@ URL:            https://github.com/elementary/wingpanel-indicator-network
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 2f450d0154..a6f7d09a15 100644
--- a/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec
@@ -13,7 +13,7 @@ URL:            https://github.com/elementary/wingpanel-indicator-nightlight
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 b091bd1781..e2363b2661 100644
--- a/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec
@@ -13,7 +13,7 @@ URL:            https://github.com/elementary/wingpanel-indicator-notifications
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 744d49b2c7..221166921e 100644
--- a/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec
@@ -13,7 +13,7 @@ URL:            https://github.com/elementary/wingpanel-indicator-power
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 2ab583a635..28eb8f3657 100644
--- a/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec
@@ -13,7 +13,7 @@ URL:            https://github.com/elementary/wingpanel-indicator-session
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
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 e72543c14e..7930742e0b 100644
--- a/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec
@@ -13,7 +13,7 @@ URL:            https://github.com/elementary/%{name}
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 
diff --git a/anda/desktops/elementary/wingpanel/wingpanel.spec b/anda/desktops/elementary/wingpanel/wingpanel.spec
index b8a4d049fb..ba6bd7da99 100644
--- a/anda/desktops/elementary/wingpanel/wingpanel.spec
+++ b/anda/desktops/elementary/wingpanel/wingpanel.spec
@@ -15,7 +15,7 @@ Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  libappstream-glib
+BuildRequires:  appstream
 BuildRequires:  meson
 BuildRequires:  vala >= 0.24.0
 
diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
index d85385dd19..9b155812ac 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
-appstreamcli validate --nonet \
+appstream-util validate-relax --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 42f9fc27f3..e1a697dfd9 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
-appstreamcli validate --nonet \
+appstream-util validate-relax --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 f5956bceb3..61b4a3e887 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
-appstreamcli validate --nonet \
+appstream-util validate-relax --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 c06375b9dd..fcaaa79365 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
-appstreamcli validate --nonet \
+appstream-util validate-relax --nonet \
     %{buildroot}%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml
 %endif