From 08bee8c8d85a063da0c4e887e789ebd4e3870e44 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 28 Jul 2024 04:01:20 +0800 Subject: [PATCH] fix: switchboard-plug-about (#1674) (cherry picked from commit f1c3f32211b8afc17dc5f2b90a8bade6d3eabed7) --- .../switchboard-plug-about.spec | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) 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 466c1890cd..731f6d235c 100644 --- a/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec +++ b/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec @@ -3,8 +3,8 @@ %global srcname switchboard-plug-about %global plug_type hardware -%global plug_name about -%global plug_rdnn io.elementary.switchboard.about +%global plug_name system +%global plug_rdnn io.elementary.settings.system Name: switchboard-plug-about Summary: Switchboard System Information plug @@ -18,21 +18,16 @@ Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson -BuildRequires: vala >= 0.22.0 BuildRequires: fdupes -BuildRequires: pkgconfig(appstream) >= 0.12.10 BuildRequires: pkgconfig(fwupd) -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.64.0 -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(granite) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libgtop-2.0) -BuildRequires: pkgconfig(libhandy-1) -BuildRequires: pkgconfig(switchboard-2.0) -BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(switchboard-3) BuildRequires: pkgconfig(udisks2) +BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(packagekit-glib2) +BuildRequires: pkgconfig(polkit-gobject-1) Requires: switchboard%{?_isa} Supplements: switchboard%{?_isa} @@ -55,24 +50,25 @@ This switchboard plug shows system information. %install %meson_install %fdupes %buildroot%_datadir/locale/ -%find_lang %{plug_name}-plug +%find_lang %{plug_rdnn} -# remove the specified stock icon from appdata (invalid in libappstream-glib) -sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml +mv %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml{.in,} +# remove the specified stock icon from metainfo (invalid in libappstream-glib) +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 +%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}.appdata.xml +%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %changelog