From 6c0e3b41f48c0e950ea8b04c4415618314899bf1 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 28 Jul 2024 04:01:34 +0800 Subject: [PATCH] fix: switchboard-plug-sound (#1672) (cherry picked from commit 1f2a74798813705580c0ec1a0f36b2e2b58b8138) # Conflicts: # anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec --- .../switchboard-plug-sound.spec | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) 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 92bfeefcb6..3c650e898b 100644 --- a/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec +++ b/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec @@ -4,7 +4,7 @@ %global plug_type system %global plug_name sound -%global plug_rdnn io.elementary.switchboard.sound +%global plug_rdnn io.elementary.settings.sound Name: switchboard-plug-sound Summary: Switchboard Sound Plug @@ -18,17 +18,11 @@ Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson -BuildRequires: vala >= 0.34.1 BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(granite) -BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libcanberra) -BuildRequires: pkgconfig(libcanberra-gtk) BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(libhandy-1) -BuildRequires: pkgconfig(libpulse-mainloop-glib) -BuildRequires: pkgconfig(switchboard-2.0) +BuildRequires: pkgconfig(switchboard-3) Requires: switchboard%{?_isa} Supplements: switchboard%{?_isa} @@ -48,9 +42,9 @@ A sound plug for Switchboard. %install %meson_install -%find_lang %{plug_name}-plug +%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 @@ -58,13 +52,14 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.met 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_rdnn}.so %{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml +%{_datadir}/glib-2.0/schemas/%{plug_name}.gschema.xml %changelog