From b584acc8359c44db510dcdefd28d4041e94ed2bf Mon Sep 17 00:00:00 2001 From: lea Date: Sun, 11 Aug 2024 04:29:09 -0700 Subject: [PATCH] fix: switchboard-plug-networking (#1669) (#1727) * fix: switchboard-plug-networking * Update switchboard-plug-networking.spec Signed-off-by: madomado --------- Signed-off-by: madomado (cherry picked from commit 453a96d731b37e220a7f65adb956cdeef19ec34a) # Conflicts: # anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec Co-authored-by: madomado --- .../switchboard-plug-networking.spec | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) 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 ae6afb6c59..03191cd8ed 100644 --- a/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec +++ b/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec @@ -4,7 +4,7 @@ %global plug_type network %global plug_name networking -%global plug_rdnn io.elementary.switchboard.network +%global plug_rdnn io.elementary.settings.network Name: switchboard-plug-networking Summary: Switchboard Networking plug @@ -21,13 +21,9 @@ BuildRequires: meson BuildRequires: vala >= 0.22.0 BuildRequires: pkgconfig(glib-2.0) >= 2.32 -BuildRequires: pkgconfig(granite) -BuildRequires: pkgconfig(gthread-2.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libnm) >= 1.20.6 -BuildRequires: pkgconfig(libnma) -BuildRequires: pkgconfig(polkit-gobject-1) -BuildRequires: pkgconfig(switchboard-2.0) +BuildRequires: pkgconfig(libnm) +BuildRequires: pkgconfig(libnma-gtk4) +BuildRequires: pkgconfig(switchboard-3) Requires: network-manager-applet%{?_isa} Requires: switchboard%{?_isa} @@ -50,21 +46,21 @@ A switchboard plug for configuring available networks. %install %meson_install -%find_lang %{plug_name}-plug +%find_lang %{plug_rdnn} %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}/libnetwork.so -%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml +%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %changelog