From 2f5979028cc2ccb600ef300f95d6bac23de76245 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 29 Jul 2024 03:02:14 -0700 Subject: [PATCH] fix: switchboard-plug-applications (#1675) (#1694) (cherry picked from commit 81bd31bef2bb6f6f2a1bd35403b95f52931c7b2c) Co-authored-by: madomado --- .../switchboard-plug-applications.spec | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 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 95d9bcc5dd..76ee38308c 100644 --- a/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec +++ b/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec @@ -4,7 +4,7 @@ %global plug_type personal %global plug_name applications -%global plug_rdnn io.elementary.switchboard.%{plug_name} +%global plug_rdnn io.elementary.settings.%{plug_name} Name: switchboard-plug-applications Summary: Switchboard Applications plug @@ -18,16 +18,11 @@ Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson -BuildRequires: vala >= 0.22.0 BuildRequires: fdupes -BuildRequires: pkgconfig(flatpak) >= 1.1.2 +BuildRequires: pkgconfig(flatpak) BuildRequires: pkgconfig(glib-2.0) >= 2.34 -BuildRequires: pkgconfig(granite) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libhandy-1) -BuildRequires: pkgconfig(switchboard-2.0) -BuildRequires: pkgconfig(libhandy-1) +BuildRequires: pkgconfig(switchboard-3) Requires: switchboard%{?_isa} Supplements: switchboard%{?_isa} @@ -49,10 +44,10 @@ 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 +mv %buildroot%_datadir/metainfo/%plug_rdnn.metainfo.xml %buildroot%_datadir/metainfo/%plug_rdnn.metainfo.xml || true +%find_lang %{plug_rdnn} -# remove the specified stock icon from appdata (invalid in libappstream-glib) +# remove the specified stock icon from metainfo (invalid in libappstream-glib) sed -i '/icon type="stock"/d' %{buildroot}%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml @@ -61,11 +56,11 @@ appstream-util validate-relax --nonet \ %{buildroot}%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml -%files -f %{plug_name}-plug.lang +%files -f %{plug_rdnn}.lang %doc README.md %license COPYING -%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so +%{_libdir}/switchboard-3/%{plug_type}/lib%{plug_name}.so %{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %{_datadir}/icons/hicolor/*/apps/io.elementary.settings.applications.svg