From 4dc3f88cec47486e6fefb0f6849453035cad4148 Mon Sep 17 00:00:00 2001 From: lea Date: Sun, 11 Aug 2024 04:27:12 -0700 Subject: [PATCH] fix: switchboard-plug-locale (#1677) (#1734) (cherry picked from commit 9a67308286496d4c18f4a9ae170273961eb12bb7) # Conflicts: # anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec Co-authored-by: madomado --- .../switchboard-plug-locale.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec b/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec index fd648f6ca7..fd0f32d142 100644 --- a/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec +++ b/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec @@ -4,7 +4,7 @@ %global plug_type personal %global plug_name locale -%global plug_rdnn io.elementary.switchboard.locale +%global plug_rdnn io.elementary.settings.locale Name: switchboard-plug-locale Summary: Switchboard Locale Plug @@ -22,9 +22,7 @@ BuildRequires: vala BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(ibus-1.0) -BuildRequires: pkgconfig(gnome-desktop-3.0) -BuildRequires: pkgconfig(granite) -BuildRequires: polkit-devel +BuildRequires: pkgconfig(gnome-desktop-4) BuildRequires: switchboard-devel Requires: switchboard%?_isa @@ -44,7 +42,7 @@ Supplements: switchboard%?_isa %install %meson_install -%find_lang %plug_name-plug +%find_lang %plug_rdnn %check @@ -52,13 +50,13 @@ appstream-util validate-relax --nonet \ %buildroot/%_datadir/metainfo/%plug_rdnn.appdata.xml -%files -f %plug_name-plug.lang +%files -f %plug_rdnn.lang %doc README.md %license COPYING -%_libdir/switchboard/%plug_type/lib%plug_name-plug.so -%_libdir/switchboard/personal/pantheon-locale/languagelist -%_libdir/switchboard/personal/pantheon-locale/packages_blacklist +%_libdir/switchboard-3/%plug_type/lib%plug_rdnn.so +%_libdir/switchboard-3/%plug_type/pantheon-locale/languagelist +%_libdir/switchboard-3/%plug_type/pantheon-locale/packages_blocklist %_datadir/glib-2.0/schemas/%plug_rdnn.gschema.xml %_datadir/polkit-1/actions/%plug_rdnn.policy