From e2e93121e6eab661657b4320e0c8c79331f0bcac Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Wed, 28 Jun 2023 16:21:48 -0700 Subject: [PATCH] fix(switchboard-plug-applications): fix building (#614) * fix(switchboard-plug-applications): fix building Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * Update switchboard-plug-applications.spec * fix(metainfo): switchboard-plug-applications Signed-off-by: madomado * wait, is it appdata? Signed-off-by: madomado * idk Signed-off-by: madomado * fix(files): ~ Signed-off-by: madomado * fix: include correct icon filename Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> Signed-off-by: madomado Co-authored-by: madomado --- .../switchboard-plug-applications.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 c2dc1a7631..369465d3c7 100644 --- a/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec +++ b/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec @@ -25,6 +25,7 @@ BuildRequires: pkgconfig(flatpak) >= 1.1.2 BuildRequires: pkgconfig(glib-2.0) >= 2.34 BuildRequires: pkgconfig(granite) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(switchboard-2.0) Requires: switchboard%{?_isa} @@ -47,15 +48,16 @@ that allows the user to manage application settings. %install %meson_install %fdupes %buildroot%_datadir/locale/ +mv %buildroot%_datadir/metainfo/%plug_rdnn.appdata.xml %buildroot%_datadir/metainfo/%plug_rdnn.metainfo.xml || true %find_lang %{plug_name}-plug # remove the specified stock icon from appdata (invalid in libappstream-glib) -sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml +sed -i '/icon type="stock"/d' %{buildroot}%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %check appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml + %{buildroot}%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %files -f %{plug_name}-plug.lang @@ -64,7 +66,8 @@ appstream-util validate-relax --nonet \ %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so -%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml +%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml +%{_datadir}/icons/hicolor/*/apps/io.elementary.settings.applications.svg %changelog